From badaf40ca84952e3a5364348f6ba2981d9130385 Mon Sep 17 00:00:00 2001
From: Beaudan <beau@loki.network>
Date: Wed, 16 Jan 2019 15:15:23 +1100
Subject: [PATCH] bit of readability and catching error (but just silencing for
 now)

---
 js/modules/data.js           | 3 ++-
 js/modules/loki_snode_api.js | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/js/modules/data.js b/js/modules/data.js
index b02728108..9a1d34649 100644
--- a/js/modules/data.js
+++ b/js/modules/data.js
@@ -690,7 +690,8 @@ async function saveConversations(data) {
 }
 
 async function getConversationById(id, { Conversation }) {
-  const data = setifyProperty(await channels.getConversationById(id), 'swarmNodes');
+  const rawData = await channels.getConversationById(id)
+  const data = setifyProperty(rawData, 'swarmNodes');
   return new Conversation(data);
 }
 
diff --git a/js/modules/loki_snode_api.js b/js/modules/loki_snode_api.js
index 5cbab41af..d4e0d1553 100644
--- a/js/modules/loki_snode_api.js
+++ b/js/modules/loki_snode_api.js
@@ -92,7 +92,13 @@ class LokiSnodeAPI {
     const conversation = window.ConversationController.get(pubKey);
     if (!(pubKey in this.swarmsPendingReplenish)) {
       this.swarmsPendingReplenish[pubKey] = new Promise(async (resolve) => {
-        const newSwarmNodes = new Set(await this.getSwarmNodes(pubKey));
+        let newSwarmNodes
+        try {
+          newSwarmNodes = new Set(await this.getSwarmNodes(pubKey));
+        } catch (e) {
+          // TODO: Handle these errors sensibly
+          newSwarmNodes = new Set([]);
+        }
         conversation.set({ swarmNodes: newSwarmNodes });
         await window.Signal.Data.updateConversation(conversation.id, conversation.attributes, {
           Conversation: Whisper.Conversation,