From 4e16b91f54d22815bc355c9d2903feae986cef17 Mon Sep 17 00:00:00 2001
From: James Graham <james.h.graham@protonmail.com>
Date: Fri, 17 Mar 2023 10:07:31 +0000
Subject: [PATCH] Hide local edit message

When a local message is edited make sure that the initial message that will be merged remains hidden so it doesn't flash up then disappear.

closes network/neochat#314
---
 src/models/messageeventmodel.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/models/messageeventmodel.cpp b/src/models/messageeventmodel.cpp
index 7413bbd46..c3c2041c5 100644
--- a/src/models/messageeventmodel.cpp
+++ b/src/models/messageeventmodel.cpp
@@ -605,6 +605,11 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
 
     if (role == SpecialMarksRole) {
         if (isPending) {
+            // A pending event with an m.new_content key will be merged into the
+            // original event so don't show.
+            if (evt.contentJson().contains("m.new_content")) {
+                return EventStatus::Hidden;
+            }
             return pendingIt->deliveryStatus();
         }