A number of small fixes for Link Previews

js/models/conversations.js

@@ -779,8 +779,10 @@
           media
             .filter(
               attachment =>
-                (attachment && attachment.thumbnail) || attachment.message
+                attachment &&
+                (attachment.image || (!attachment.pending && !attachment.error))
             )
+            .slice(0, 1)
             .map(async attachment => {
               const { fileName } = attachment;
 

js/models/messages.js

@@ -1182,7 +1182,7 @@
               urls.includes(item.url) &&
               window.Signal.LinkPreviews.isLinkInWhitelist(item.url)
           );
-          if (preview.length > incomingPreview.length) {
+          if (preview.length < incomingPreview.length) {
             window.log.info(
               `${message.idForLogging()}: Eliminated ${preview.length -
                 incomingPreview.length} previews with invalid urls'`