From 38ff70e2ecbfc346daf9046df667b3d94242406e Mon Sep 17 00:00:00 2001
From: Beaudan <beau@loki.network>
Date: Wed, 30 Jan 2019 14:23:36 +1100
Subject: [PATCH] Fixed some little redundant stuff in the message and snode
 api

---
 app/sql.js                     |  2 +-
 js/modules/loki_message_api.js | 11 +++--------
 js/modules/loki_snode_api.js   |  5 +----
 libloki/api.js                 |  1 +
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/app/sql.js b/app/sql.js
index 3a1b11cfe..69ac92755 100644
--- a/app/sql.js
+++ b/app/sql.js
@@ -1128,7 +1128,7 @@ async function getSwarmNodesByPubkey(pubkey) {
   });
 
   if (!row) {
-    return null;
+    return [];
   }
 
   return jsonToObject(row.json).swarmNodes;
diff --git a/js/modules/loki_message_api.js b/js/modules/loki_message_api.js
index d479c3731..7c9a8721b 100644
--- a/js/modules/loki_message_api.js
+++ b/js/modules/loki_message_api.js
@@ -105,20 +105,15 @@ class LokiMessageAPI {
       throw HTTPError('sendMessage: error response', response.status, result);
     };
 
-    let swarmNodes;
-    try {
-      swarmNodes = await window.LokiSnodeAPI.getSwarmNodesByPubkey(pubKey);
-    } catch (e) {
-      throw new window.textsecure.EmptySwarmError(pubKey, e);
-    }
+    let swarmNodes = await window.LokiSnodeAPI.getSwarmNodesByPubkey(pubKey);
     while (successfulRequests < MINIMUM_SUCCESSFUL_REQUESTS) {
       if (!canResolve) {
         throw new window.textsecure.DNSResolutionError('Sending messages');
       }
-      if (!swarmNodes || swarmNodes.length === 0) {
+      if (swarmNodes.length === 0) {
         swarmNodes = await window.LokiSnodeAPI.getFreshSwarmNodes(pubKey);
         swarmNodes = _.difference(swarmNodes, completedNodes);
-        if (!swarmNodes || swarmNodes.length === 0) {
+        if (swarmNodes.length === 0) {
           if (successfulRequests !== 0) {
             // TODO: Decide how to handle some completed requests but not enough
             return;
diff --git a/js/modules/loki_snode_api.js b/js/modules/loki_snode_api.js
index d6000c3e8..cc18abaa0 100644
--- a/js/modules/loki_snode_api.js
+++ b/js/modules/loki_snode_api.js
@@ -108,10 +108,7 @@ class LokiSnodeAPI {
 
   async getSwarmNodesByPubkey(pubKey) {
     const swarmNodes = await window.Signal.Data.getSwarmNodesByPubkey(pubKey);
-    if (swarmNodes) {
-      return swarmNodes;
-    }
-    return [];
+    return swarmNodes;
   }
 
   async saveSwarmNodes(pubKey, swarmNodes) {
diff --git a/libloki/api.js b/libloki/api.js
index d317c05ac..20ba72622 100644
--- a/libloki/api.js
+++ b/libloki/api.js
@@ -18,6 +18,7 @@
   }
 
   async function sendOnlineBroadcastMessage(pubKey) {
+    // TODO: Make this actually get a loki address rather than junk string
     const lokiAddressMessage = new textsecure.protobuf.LokiAddressMessage({
       p2pAddress: 'testAddress',
       p2pPort: parseInt(window.localServerPort, 10),