From 005c51c3b59263e45af7cfeff5a9e6571104e663 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Wed, 10 Apr 2019 02:19:38 +0300 Subject: Re-add reply rendering --- ui/messages/parser.go | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'ui/messages/parser.go') diff --git a/ui/messages/parser.go b/ui/messages/parser.go index 7b76a69..097c9d0 100644 --- a/ui/messages/parser.go +++ b/ui/messages/parser.go @@ -37,13 +37,18 @@ func ParseEvent(matrix ifc.MatrixContainer, room *rooms.Room, evt *mautrix.Event return nil } if len(evt.Content.GetReplyTo()) > 0 { - roomID := evt.Content.RelatesTo.InReplyTo.RoomID - if len(roomID) == 0 { - roomID = room.ID + replyToRoom := room + if len(evt.Content.RelatesTo.InReplyTo.RoomID) > 0 { + replyToRoom = matrix.GetRoom(evt.Content.RelatesTo.InReplyTo.RoomID) } - replyToEvt, _ := matrix.GetEvent(room, evt.Content.GetReplyTo()) + replyToEvt, _ := matrix.GetEvent(replyToRoom, evt.Content.GetReplyTo()) if replyToEvt != nil { - // TODO add reply header + replyToMsg := directParseEvent(matrix, replyToRoom, replyToEvt) + if replyToMsg != nil { + msg.SetReplyTo(replyToMsg) + } else { + // TODO add unrenderable reply header + } } else { // TODO add unknown reply header } -- cgit v1.2.3