diff options
| author | Tulir Asokan <tulir@maunium.net> | 2020-04-19 15:00:49 +0300 |
|---|---|---|
| committer | Tulir Asokan <tulir@maunium.net> | 2020-04-19 15:01:16 +0300 |
| commit | 5ee6aa72dbb2cc4b437624f7e2d5821234c2fc7c (patch) | |
| tree | 5da8e858f598be02b8a4ca547dcbc21e9b5c1743 /ui/room-view.go | |
| parent | ac1b0540a2f5979346277271ec733d19a0b25228 (diff) | |
Update mautrix-go content stuff
Diffstat (limited to 'ui/room-view.go')
| -rw-r--r-- | ui/room-view.go | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/ui/room-view.go b/ui/room-view.go index 8408e25..ba6259b 100644 --- a/ui/room-view.go +++ b/ui/room-view.go @@ -480,8 +480,8 @@ func (view *RoomView) SetEditing(evt *muksevt.Event) { view.editing = evt // replying should never be non-nil when SetEditing, but do this just to be safe view.replying = nil - text := view.editing.Content.Body - if view.editing.Content.MsgType == event.MsgEmote { + text := view.editing.Content.AsMessage().Body + if view.editing.Content.AsMessage().MsgType == event.MsgEmote { text = "/me " + text } view.input.SetText(text) @@ -497,11 +497,11 @@ func (view *RoomView) filterOwnOnly(evt *muksevt.Event) bool { } func (view *RoomView) filterMediaOnly(evt *muksevt.Event) bool { - return evt.Type == event.EventMessage && ( - evt.Content.MsgType == event.MsgFile || - evt.Content.MsgType == event.MsgImage || - evt.Content.MsgType == event.MsgAudio || - evt.Content.MsgType == event.MsgVideo) + content, ok := evt.Content.Parsed.(*event.MessageEventContent) + return ok && content.MsgType == event.MsgFile || + content.MsgType == event.MsgImage || + content.MsgType == event.MsgAudio || + content.MsgType == event.MsgVideo } func (view *RoomView) findMessage(current *muksevt.Event, forward bool, allow findFilter) *messages.UIMessage { @@ -660,13 +660,11 @@ func (view *RoomView) SendReaction(eventID id.EventID, reaction string) { Event: &event.Event{ Type: event.EventReaction, RoomID: view.Room.ID, - Content: event.Content{ - RelatesTo: &event.RelatesTo{ - Type: event.RelAnnotation, - EventID: eventID, - Key: reaction, - }, - }, + Content: event.Content{Parsed: event.ReactionEventContent{RelatesTo: event.RelatesTo{ + Type: event.RelAnnotation, + EventID: eventID, + Key: reaction, + }}}, }, }) if err != nil { @@ -745,9 +743,9 @@ func (view *RoomView) Update() { } func (view *RoomView) UpdateUserList() { - pls := &event.PowerLevels{} + pls := &event.PowerLevelsEventContent{} if plEvent := view.Room.GetStateEvent(event.StatePowerLevels, ""); plEvent != nil { - pls = plEvent.Content.GetPowerLevels() + pls = plEvent.Content.AsPowerLevels() } view.userList.Update(view.Room.GetMembers(), pls) view.userListLoaded = true |