From 1650d758a54bf27236ab4570defd9ceefdbb6871 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 26 Jun 2020 14:08:21 +1000
Subject: [PATCH] fix calls with NoteToSelf case -> morph the message to a
 syncMessage

---
 js/models/conversations.js | 12 ++++++++----
 js/models/messages.js      |  8 +++++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/js/models/conversations.js b/js/models/conversations.js
index 46b1e1d85..e763d60dd 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -1319,7 +1319,10 @@
         // Special-case the self-send case - we send only a sync message
         if (this.isMe()) {
           await message.markMessageSyncOnly();
-          return libsession.getMessageQueue().sendSyncMessage(chatMessage);
+          const syncMessage = libsession.Utils.SyncMessageUtils.from(
+            chatMessage
+          );
+          return libsession.getMessageQueue().sendSyncMessage(syncMessage);
         }
         const options = {};
 
@@ -1651,9 +1654,10 @@
           expireUpdate
         );
         await message.markMessageSyncOnly();
-        return libsession
-          .getMessageQueue()
-          .sendSyncMessage(expirationTimerMessage);
+        const syncMessage = libsession.Utils.SyncMessageUtils.from(
+          expirationTimerMessage
+        );
+        return libsession.getMessageQueue().sendSyncMessage(syncMessage);
       }
 
       if (this.get('type') === 'private') {
diff --git a/js/models/messages.js b/js/models/messages.js
index 30cade846..6c3affd0a 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -1044,7 +1044,8 @@
         this.trigger('pending');
         // FIXME audric add back profileKey
         await this.markMessageSyncOnly();
-        return libsession.getMessageQueue().sendSyncMessage(chatMessage);
+        const syncMessage = libsession.Utils.SyncMessageUtils.from(chatMessage);
+        return libsession.getMessageQueue().sendSyncMessage(syncMessage);
       }
 
       if (conversation.isPrivate()) {
@@ -1058,7 +1059,7 @@
       }
 
       this.trigger('pending');
-      // TODO should we handle open groups message here too?
+      // TODO should we handle open groups message here too? and mediumgroups
       // Not sure there is the concept of retrySend for those
       const closedGroupChatMessage = new libsession.Messages.Outgoing.ClosedGroupChatMessage(
         {
@@ -1123,7 +1124,8 @@
       if (number === this.OUR_NUMBER) {
         this.trigger('pending');
         await this.markMessageSyncOnly();
-        return libsession.getMessageQueue().sendSyncMessage(chatMessage);
+        const syncMessage = libsession.Utils.SyncMessageUtils.from(chatMessage);
+        return libsession.getMessageQueue().sendSyncMessage(syncMessage);
       }
       const conversation = this.getConversation();
       const recipientPubKey = new libsession.Types.PubKey(number);