Merge pull request #1244 from Bilb/fix-sending-errors-handling

oxen-io · Jul 14, 2020 · 4e56ad2 · 4e56ad2
2 parents 1a27fc4 + 48e4862
commit 4e56ad2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/js/models/messages.js b/js/models/messages.js
@@ -1087,17 +1087,25 @@
         }
 
         const { body, attachments, preview, quote } = await this.uploadData();
+        const ourNumber = window.storage.get('primaryDevicePubKey');
+        const ourConversation = window.ConversationController.get(ourNumber);
 
-        const chatMessage = new libsession.Messages.Outgoing.ChatMessage({
+        const chatParams = {
           identifier: this.id,
           body,
           timestamp: this.get('sent_at'),
           expireTimer: this.get('expireTimer'),
           attachments,
           preview,
           quote,
-          lokiProfile: this.conversation.getOurProfile(),
-        });
+        };
+        if (ourConversation) {
+          chatParams.lokiProfile = ourConversation.getOurProfile();
+        }
+
+        const chatMessage = new libsession.Messages.Outgoing.ChatMessage(
+          chatParams
+        );
 
         // Special-case the self-send case - we send only a sync message
         if (recipients.length === 1) {

diff --git a/js/modules/loki_message_api.js b/js/modules/loki_message_api.js
@@ -96,8 +96,9 @@ class LokiMessageAPI {
       // eslint-disable-next-line more/no-then
       snode = await primitives.firstTrue(promises);
     } catch (e) {
+      const snodeStr = snode ? `${snode.ip}:${snode.port}` : 'null';
       log.warn(
-        `loki_message:::sendMessage - ${e.code} ${e.message} to ${pubKey} via ${snode.ip}:${snode.port}`
+        `loki_message:::sendMessage - ${e.code} ${e.message} to ${pubKey} via snode:${snodeStr}`
       );
       if (e instanceof textsecure.WrongDifficultyError) {
         // Force nonce recalculation

diff --git a/ts/session/snode_api/serviceNodeAPI.ts b/ts/session/snode_api/serviceNodeAPI.ts
@@ -298,8 +298,6 @@ export async function storeOnNode(
         return false;
       }
 
-      const res = snodeRes as any;
-
       const json = JSON.parse(snodeRes.body);
       // Make sure we aren't doing too much PoW
       const currentDifficulty = window.storage.get('PoWDifficulty', null);