n/nyxmuks
1
0
Fork 0
forked from Mirrors/gomuks
Code Pull requests Activity

web/timeline: read relates_to from correct content

Browse source
This commit is contained in:
Tulir Asokan 2024-10-23 01:21:21 +03:00
parent 1f521f8fac
commit b24a34ef97
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
web/src/ui/timeline/TimelineEvent.tsx
View file

@ -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}/>