From 58cc6551e57b099f5cf3367cc9fc1c82c07e6f78 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 22 Feb 2021 09:58:29 +1100
Subject: [PATCH] fix updates of message on message syncing

---
 ts/models/message.ts                          |  1 +
 .../outgoing/content/data/ChatMessage.ts      | 20 ++++++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/ts/models/message.ts b/ts/models/message.ts
index 75bc5ffa1..298f1cd4b 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -1055,6 +1055,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
         throw new Error('Cannot trigger syncMessage with unknown convo.');
       }
       const syncMessage = ChatMessage.buildSyncMessage(
+        this.id,
         dataMessage,
         conversation.id,
         sentTimestamp
diff --git a/ts/session/messages/outgoing/content/data/ChatMessage.ts b/ts/session/messages/outgoing/content/data/ChatMessage.ts
index 4de97ab2e..fcd5ad6f4 100644
--- a/ts/session/messages/outgoing/content/data/ChatMessage.ts
+++ b/ts/session/messages/outgoing/content/data/ChatMessage.ts
@@ -91,19 +91,13 @@ export class ChatMessage extends DataMessage {
   }
 
   public static buildSyncMessage(
-    dataMessage: SignalService.IDataMessage,
+    identifier: string,
+    dataMessage: SignalService.DataMessage,
     syncTarget: string,
     sentTimestamp: number
   ) {
-    // the dataMessage.profileKey is of type ByteBuffer. We need to make it a Uint8Array
-    const lokiProfile: any = {
-      profileKey: new Uint8Array(
-        (dataMessage.profileKey as any).toArrayBuffer()
-      ),
-    };
-
     if (
-      (dataMessage as any)?.$type?.name !== 'DataMessage' &&
+      (dataMessage as any).constructor.name !== 'DataMessage' &&
       !(dataMessage instanceof DataMessage)
     ) {
       throw new Error(
@@ -114,6 +108,13 @@ export class ChatMessage extends DataMessage {
     if (!sentTimestamp || !isNumber(sentTimestamp)) {
       throw new Error('Tried to build a sync message without a sentTimestamp');
     }
+    // the dataMessage.profileKey is of type ByteBuffer. We need to make it a Uint8Array
+    const lokiProfile: any = {};
+    if (dataMessage.profileKey?.length) {
+      lokiProfile.profileKey = new Uint8Array(
+        (dataMessage.profileKey as any).toArrayBuffer()
+      );
+    }
 
     if (dataMessage.profile) {
       if (dataMessage.profile?.displayName) {
@@ -141,6 +142,7 @@ export class ChatMessage extends DataMessage {
     const preview = (dataMessage.preview as Array<Preview>) || [];
 
     return new ChatMessage({
+      identifier,
       timestamp,
       attachments,
       body,