From b24a34ef9774b956673d9ff9b140ba91660931d6 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Wed, 23 Oct 2024 01:21:21 +0300
Subject: [PATCH] web/timeline: read relates_to from correct content

---
 web/src/ui/timeline/TimelineEvent.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/web/src/ui/timeline/TimelineEvent.tsx b/web/src/ui/timeline/TimelineEvent.tsx
index e349296..daa6787 100644
--- a/web/src/ui/timeline/TimelineEvent.tsx
+++ b/web/src/ui/timeline/TimelineEvent.tsx
@@ -92,7 +92,8 @@ const TimelineEvent = ({ room, evt, prevEvt, setReplyToRef }: TimelineEventProps
 	const fullTime = fullTimeFormatter.format(eventTS)
 	const shortTime = formatShortTime(eventTS)
 	const editTime = editEventTS ? `Edited at ${fullTimeFormatter.format(editEventTS)}` : null
-	const replyTo = evt.content?.["m.relates_to"]?.["m.in_reply_to"]?.event_id
+	const relatesTo = (evt.orig_content ?? evt.content)?.["m.relates_to"]
+	const replyTo = relatesTo?.["m.in_reply_to"]?.event_id
 	const mainEvent = <div data-event-id={evt.event_id} className={wrapperClassNames.join(" ")}>
 		<div className="sender-avatar" title={evt.sender}>
 			<img
@@ -117,7 +118,7 @@ const TimelineEvent = ({ room, evt, prevEvt, setReplyToRef }: TimelineEventProps
 			{isEventID(replyTo) && BodyType !== HiddenEvent ? <ReplyIDBody
 				room={room}
 				eventID={replyTo}
-				isThread={evt.content?.["m.relates_to"]?.rel_type === "m.thread"}
+				isThread={relatesTo?.rel_type === "m.thread"}
 			/> : null}
 			<ContentErrorBoundary>
 				<BodyType room={room} sender={memberEvt} event={evt}/>