From 27c60623516322952a36b3d25783f2aee8577bdc Mon Sep 17 00:00:00 2001
From: Mikunj <mikunj@live.com.au>
Date: Fri, 8 Feb 2019 13:43:14 +1100
Subject: [PATCH] Fix incoming messages not showing previews. Linting.

---
 js/link_previews_helper.js | 16 ++++++++++------
 js/models/messages.js      | 36 ++++++++++++++++++++++++++++--------
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/js/link_previews_helper.js b/js/link_previews_helper.js
index fe468690c..bb73d386a 100644
--- a/js/link_previews_helper.js
+++ b/js/link_previews_helper.js
@@ -21,13 +21,17 @@
     if (base64ImageCache[url]) return base64ImageCache[url];
 
     // Set the cache and return the value
-    const contentType = image.contentType || 'image/jpeg';
-    const base64 = dcodeIO.ByteBuffer.wrap(image.data).toString('base64');
+    try {
+      const contentType = image.contentType || 'image/jpeg';
+      const base64 = dcodeIO.ByteBuffer.wrap(image.data).toString('base64');
 
-    const data = `data:${contentType};base64, ${base64}`;
-    base64ImageCache[url] = data;
+      const data = `data:${contentType};base64, ${base64}`;
+      base64ImageCache[url] = data;
 
-    return data;
+      return data;
+    } catch (e) {
+      return null;
+    }
   }
 
   async function makeChunkedRequest(url) {
@@ -147,5 +151,5 @@
   window.Signal.LinkPreviews.helper = {
     getPreview,
     getBase64Image,
-  }
+  };
 })();
diff --git a/js/models/messages.js b/js/models/messages.js
index 4f917cc1f..34b652021 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -8,7 +8,6 @@
 /* global Signal: false */
 /* global textsecure: false */
 /* global Whisper: false */
-/* global dcodeIO: false */
 
 /* eslint-disable more/no-then */
 
@@ -113,16 +112,29 @@
       return !!(this.get('flags') & flag);
     },
     async updatePreviews() {
-      if (this.updatingPreview) return;
+      // Don't generate link previews if user has turned them off
+      if (!storage.get('linkPreviews', false)) {
+        return;
+      }
+
+      if (this.updatingPreview) {
+        return;
+      }
 
       // Only update the preview if we don't have any set
       const preview = this.get('preview');
-      if (!_.isEmpty(preview)) return;
+      if (!_.isEmpty(preview)) {
+        return;
+      }
 
       // Make sure we have links we can preview
       const links = Signal.LinkPreviews.findLinks(this.get('body'));
-      const firstLink = links.find(link => Signal.LinkPreviews.isLinkInWhitelist(link));
-      if (!firstLink) return;
+      const firstLink = links.find(link =>
+        Signal.LinkPreviews.isLinkInWhitelist(link)
+      );
+      if (!firstLink) {
+        return;
+      }
 
       this.updatingPreview = true;
 
@@ -139,8 +151,8 @@
           return;
         }
 
-        // We don't want to save the base64 url in the message as it will increase the size of it
-        // Rather we fetch the base64 later
+        // We don't want to save the base64 url in the message as
+        // it will increase the size of it, Rather we fetch the base64 later
         this.set({ preview: [result] });
       } catch (e) {
         window.log.warn(`Failed to load previews for message: ${this.id}`);
@@ -653,6 +665,11 @@
       });
     },
     getPropsForPreview() {
+      // Don't generate link previews if user has turned them off
+      if (!storage.get('linkPreviews', false)) {
+        return null;
+      }
+
       const previews = this.get('preview') || [];
 
       return previews.map(preview => {
@@ -672,7 +689,7 @@
               image = {
                 ...preview.image,
                 url: preview.image.url || url,
-              }
+              };
             }
           }
         }
@@ -1369,6 +1386,9 @@
             schemaVersion: dataMessage.schemaVersion,
           });
 
+          // Update the previews if we need to
+          message.updatePreviews();
+
           if (type === 'outgoing') {
             const receipts = Whisper.DeliveryReceipts.forMessage(
               conversation,