fix(chat): send message after store&publish

Satellite-im · Sep 19, 2022 · f521efc · f521efc
1 parent f40b193
commit f521efc
Showing 1 changed file with 21 additions and 17 deletions.
diff --git a/libraries/Iridium/chat/ChatManager.ts b/libraries/Iridium/chat/ChatManager.ts
@@ -730,32 +730,36 @@ export default class ChatManager extends Emitter<ConversationMessage> {
       ...partial,
       id: tempCid.toString() as string,
     }
-    await iridium.connector.publish(
-      `/chat/conversations/${conversationId}`,
-      {
-        type: 'chat/message',
-        cid: tempCid.toString() as string,
-        message,
-      },
-      {
+
+    await Promise.all([
+      iridium.connector?.store(partial, {
+        syncPin: true,
         encrypt: conversation?.participants
-          ? { recipients: conversation.participants }
+          ? { recipients: conversation?.participants }
           : undefined,
-      },
-    )
+      }),
+      iridium.connector?.publish(
+        `/chat/conversations/${conversationId}`,
+        {
+          type: 'chat/message',
+          cid: tempCid.toString() as string,
+          message,
+        },
+        {
+          encrypt: conversation?.participants
+            ? { recipients: conversation.participants }
+            : undefined,
+        },
+      ),
+    ])
+
     Vue.set(
       this.state.conversations[conversationId].message,
       message.id,
       message,
     )
     Vue.set(this.state.conversations[conversationId], 'lastReadAt', Date.now())
 
-    iridium.connector.store(partial, {
-      syncPin: true,
-      encrypt: conversation?.participants
-        ? { recipients: conversation?.participants }
-        : undefined,
-    })
     if (message.id === undefined) {
       throw new Error('message not sent, failed to store')
     }