Merge remote-tracking branch 'dec05eba/master'

This commit is contained in:
Tulir Asokan 2020-09-09 01:24:04 +03:00
commit 5312ce28d0

View File

@ -459,10 +459,10 @@ func (view *RoomView) filterOwnOnly(evt *muksevt.Event) bool {
func (view *RoomView) filterMediaOnly(evt *muksevt.Event) bool { func (view *RoomView) filterMediaOnly(evt *muksevt.Event) bool {
content, ok := evt.Content.Parsed.(*event.MessageEventContent) content, ok := evt.Content.Parsed.(*event.MessageEventContent)
return ok && content.MsgType == event.MsgFile || return ok && (content.MsgType == event.MsgFile ||
content.MsgType == event.MsgImage || content.MsgType == event.MsgImage ||
content.MsgType == event.MsgAudio || content.MsgType == event.MsgAudio ||
content.MsgType == event.MsgVideo content.MsgType == event.MsgVideo)
} }
func (view *RoomView) findMessage(current *muksevt.Event, forward bool, allow findFilter) *messages.UIMessage { func (view *RoomView) findMessage(current *muksevt.Event, forward bool, allow findFilter) *messages.UIMessage {