From 0dd180d4f474b20d284648d91c065477cedf63c1 Mon Sep 17 00:00:00 2001
From: Beaudan Brown <beau@loki.network>
Date: Tue, 3 Sep 2019 13:54:53 +1000
Subject: [PATCH 1/2] Wrap polling function in try finally for safety, fix
 issue with empty array check and lint

---
 js/modules/loki_public_chat_api.js           | 19 ++++++++++++-----
 ts/components/conversation/MessageDetail.tsx | 22 +++++++++-----------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/js/modules/loki_public_chat_api.js b/js/modules/loki_public_chat_api.js
index c33552523..7ea7bdce3 100644
--- a/js/modules/loki_public_chat_api.js
+++ b/js/modules/loki_public_chat_api.js
@@ -411,6 +411,16 @@ class LokiPublicChannelAPI {
 
   // get channel messages
   async pollForMessages() {
+    try {
+      await this.pollOnceForMessages();
+    } finally {
+      setTimeout(() => {
+        this.pollForMessages();
+      }, GROUPCHAT_POLL_EVERY);
+    }
+  }
+
+  async pollOnceForMessages() {
     const params = {
       include_annotations: 1,
       count: -20,
@@ -437,7 +447,10 @@ class LokiPublicChannelAPI {
         if (adnMessage.is_deleted) {
           return;
         }
-        if (adnMessage.annotations !== []) {
+        if (
+          Array.isArray(adnMessage.annotations) &&
+          adnMessage.annotations.length !== 0
+        ) {
           const noteValue = adnMessage.annotations[0].value;
           ({ from, timestamp, source } = noteValue);
         }
@@ -493,10 +506,6 @@ class LokiPublicChannelAPI {
       });
       conversation.setLastRetrievedMessage(this.lastGot);
     }
-
-    setTimeout(() => {
-      this.pollForMessages();
-    }, GROUPCHAT_POLL_EVERY);
   }
 
   // create a message in the channel
diff --git a/ts/components/conversation/MessageDetail.tsx b/ts/components/conversation/MessageDetail.tsx
index 1a18a780a..deca2a6b4 100644
--- a/ts/components/conversation/MessageDetail.tsx
+++ b/ts/components/conversation/MessageDetail.tsx
@@ -56,18 +56,16 @@ export class MessageDetail extends React.Component<Props> {
   public renderDeleteButton() {
     const { i18n, message } = this.props;
 
-    return (
-      message.isDeletable ? (
-        <div className="module-message-detail__delete-button-container">
-          <button
-            onClick={message.onDelete}
-            className="module-message-detail__delete-button"
-          >
-            {i18n('deleteThisMessage')}
-          </button>
-        </div>
-      ) : null
-    );
+    return message.isDeletable ? (
+      <div className="module-message-detail__delete-button-container">
+        <button
+          onClick={message.onDelete}
+          className="module-message-detail__delete-button"
+        >
+          {i18n('deleteThisMessage')}
+        </button>
+      </div>
+    ) : null;
   }
 
   public renderContact(contact: Contact) {

From da97d158917eb7f3e51c6f2dc9f3d80adef79006 Mon Sep 17 00:00:00 2001
From: Beaudan Brown <beau@loki.network>
Date: Tue, 3 Sep 2019 16:38:11 +1000
Subject: [PATCH 2/2] Log when there are errors polling

---
 js/modules/loki_public_chat_api.js | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/js/modules/loki_public_chat_api.js b/js/modules/loki_public_chat_api.js
index 7ea7bdce3..d5b3269ce 100644
--- a/js/modules/loki_public_chat_api.js
+++ b/js/modules/loki_public_chat_api.js
@@ -365,6 +365,17 @@ class LokiPublicChannelAPI {
 
   // get moderation actions
   async pollForDeletions() {
+    try {
+      await this.pollOnceForDeletions();
+    } catch (e) {
+      log.warn(`Error while polling for public chat deletions: ${e}`);
+    }
+    setTimeout(() => {
+      this.pollForDeletions();
+    }, DELETION_POLL_EVERY);
+  }
+
+  async pollOnceForDeletions() {
     // grab the last 200 deletions
     const params = {
       count: 200,
@@ -402,22 +413,18 @@ class LokiPublicChannelAPI {
       this.deleteLastId = res.response.meta.max_id;
       ({ more } = res.response);
     }
-
-    // set up next poll
-    setTimeout(() => {
-      this.pollForDeletions();
-    }, DELETION_POLL_EVERY);
   }
 
   // get channel messages
   async pollForMessages() {
     try {
       await this.pollOnceForMessages();
-    } finally {
-      setTimeout(() => {
-        this.pollForMessages();
-      }, GROUPCHAT_POLL_EVERY);
+    } catch (e) {
+      log.warn(`Error while polling for public chat messages: ${e}`);
     }
+    setTimeout(() => {
+      this.pollForMessages();
+    }, GROUPCHAT_POLL_EVERY);
   }
 
   async pollOnceForMessages() {