lint

js/models/conversations.js

@@ -262,7 +262,7 @@
       messages.forEach(m => {
         m.acceptFriendRequest();
         lastMessage = m;
-      })
+      });
 
       if (lastMessage) {
         await this.markRead();

libtextsecure/sendmessage.js

@@ -665,13 +665,14 @@ MessageSender.prototype = {
       return Promise.resolve();
     }
     // first get all friends with primary devices
-    const sessionContactsPrimary = conversations.filter(
+    const sessionContactsPrimary =
-      c =>
+      conversations.filter(
-        c.isPrivate() &&
+        c =>
-        !c.isOurLocalDevice() &&
+          c.isPrivate() &&
-        c.isFriend() &&
+          !c.isOurLocalDevice() &&
-        !c.get('secondaryStatus')
+          c.isFriend() &&
-    ) || [];
+          !c.get('secondaryStatus')
+      ) || [];
 
     // then get all friends with secondary devices
     let sessionContactsSecondary = conversations.filter(
@@ -683,14 +684,21 @@ MessageSender.prototype = {
     );
 
     // then morph all secondary conversation to their primary
-    sessionContactsSecondary = await Promise.all(sessionContactsSecondary.map(async c => {
+    sessionContactsSecondary =
-      return window.ConversationController.getOrCreateAndWait(
+      (await Promise.all(
-        c.getPrimaryDevicePubKey(),
+        // eslint-disable-next-line arrow-body-style
-        'private'
+        sessionContactsSecondary.map(async c => {
-      );
+          return window.ConversationController.getOrCreateAndWait(
-    })) || [];
+            c.getPrimaryDevicePubKey(),
+            'private'
+          );
+        })
+      )) || [];
 
-    const contactsSet = new Set([...sessionContactsPrimary, ...sessionContactsSecondary]);
+    const contactsSet = new Set([
+      ...sessionContactsPrimary,
+      ...sessionContactsSecondary,
+    ]);
     const contacts = [...contactsSet];
 
     if (contacts.length === 0) {