From 6c890c4b7bf2ed4cd673c75ef82fc2bcf8feb083 Mon Sep 17 00:00:00 2001
From: Eric Bailey <git@esb.lol>
Date: Tue, 30 Apr 2024 20:19:29 -0500
Subject: [PATCH] Better insertion order

---
 src/state/dms/chat.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/state/dms/chat.ts b/src/state/dms/chat.ts
index ae6f1b0987..98cb32e702 100644
--- a/src/state/dms/chat.ts
+++ b/src/state/dms/chat.ts
@@ -230,6 +230,11 @@ export class Chat {
             TempDmDefs.isLogCreateMessage(log) &&
             TempDmDefs.isMessageView(log.message)
           ) {
+            if (this.newMessages.has(log.message.id)) {
+              // Trust the log as the source of truth on ordering
+              // TODO test this
+              this.newMessages.delete(log.message.id)
+            }
             this.newMessages.set(log.message.id, log.message)
           } else if (
             TempDmDefs.isLogDeleteMessage(log) &&