From 8aa134b8b23cf945f5a18e21e5fa4855e188d3c0 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Tue, 26 Mar 2019 00:37:35 +0200
Subject: Start moving to mauview

---
 ui/messages/parser/parser.go | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'ui/messages/parser')

diff --git a/ui/messages/parser/parser.go b/ui/messages/parser/parser.go
index 94ab5b6..b36fde0 100644
--- a/ui/messages/parser/parser.go
+++ b/ui/messages/parser/parser.go
@@ -102,14 +102,24 @@ func ParseMessage(matrix ifc.MatrixContainer, room *rooms.Room, evt *mautrix.Eve
 	}
 	if len(evt.Content.GetReplyTo()) > 0 {
 		evt.Content.RemoveReplyFallback()
-		replyToEvt, _ := matrix.Client().GetEvent(room.ID, evt.Content.GetReplyTo())
-		replyToEvt.Content.RemoveReplyFallback()
-		if len(replyToEvt.Content.FormattedBody) == 0 {
-			replyToEvt.Content.FormattedBody = html.EscapeString(replyToEvt.Content.Body)
+		roomID := evt.Content.RelatesTo.InReplyTo.RoomID
+		if len(roomID) == 0 {
+			roomID = room.ID
+		}
+		replyToEvt, _ := matrix.Client().GetEvent(roomID, evt.Content.GetReplyTo())
+		if replyToEvt != nil {
+			replyToEvt.Content.RemoveReplyFallback()
+			if len(replyToEvt.Content.FormattedBody) == 0 {
+				replyToEvt.Content.FormattedBody = html.EscapeString(replyToEvt.Content.Body)
+			}
+			evt.Content.FormattedBody = fmt.Sprintf(
+				"In reply to <a href='https://matrix.to/#/%[1]s'>%[1]s</a><blockquote>%[2]s</blockquote><br/>%[3]s",
+				replyToEvt.Sender, replyToEvt.Content.FormattedBody, evt.Content.FormattedBody)
+		} else {
+			evt.Content.FormattedBody = fmt.Sprintf(
+				"In reply to unknown event https://matrix.to/#/%[1]s/%[2]s<br/>%[3]s",
+				roomID, evt.Content.GetReplyTo(), evt.Content.FormattedBody)
 		}
-		evt.Content.FormattedBody = fmt.Sprintf(
-			"In reply to <a href='https://matrix.to/#/%[1]s'>%[1]s</a><blockquote>%[2]s</blockquote><br/>%[3]s",
-			replyToEvt.Sender, replyToEvt.Content.FormattedBody, evt.Content.FormattedBody)
 	}
 	ts := unixToTime(evt.Timestamp)
 	switch evt.Content.MsgType {
-- 
cgit v1.2.3