From: Clament John <17064666+clmnin@users.noreply.github.com>
Date: Tue, 15 Mar 2022 11:50:43 +0000 (+0530)
Subject: Fix view source shows original event for an edited message (#377)
X-Git-Tag: v1.8.1~3
X-Git-Url: https://git.wafflesoft.org/?a=commitdiff_plain;h=92a3a8d6fa36c2cd0ef1bfbb925432271ec19e72;p=cinny.git

Fix view source shows original event for an edited message (#377)

Signed-off-by: Clament John <cj@hackerlab.in>

fixes #376

When we click view source for an edited message we were showing
the original event (the unedited event) instead of the latest
edited event.
---

diff --git a/src/app/molecules/message/Message.jsx b/src/app/molecules/message/Message.jsx
index c011be7..f5e3e2b 100644
--- a/src/app/molecules/message/Message.jsx
+++ b/src/app/molecules/message/Message.jsx
@@ -469,6 +469,18 @@ function isMedia(mE) {
   );
 }
 
+// if editedTimeline has mEventId then pass editedMEvent else pass mEvent to openViewSource
+function handleOpenViewSource(mEvent, roomTimeline) {
+  const eventId = mEvent.getId();
+  const { editedTimeline } = roomTimeline ?? {};
+  let editedMEvent;
+  if (editedTimeline?.has(eventId)) {
+    const editedList = editedTimeline.get(eventId);
+    editedMEvent = editedList[editedList.length - 1];
+  }
+  openViewSource(editedMEvent !== undefined ? editedMEvent : mEvent);
+}
+
 const MessageOptions = React.memo(({
   roomTimeline, mEvent, edit, reply,
 }) => {
@@ -516,7 +528,7 @@ const MessageOptions = React.memo(({
             </MenuItem>
             <MenuItem
               iconSrc={CmdIC}
-              onClick={() => openViewSource(mEvent)}
+              onClick={() => handleOpenViewSource(mEvent, roomTimeline)}
             >
               View source
             </MenuItem>