Linting

js/models/messages.js

@@ -420,14 +420,16 @@
       }
 
       const devicePubKey = this.get('conversationId');
-      const otherDevices = await libloki.storage.getPairedDevicesFor(devicePubKey);
+      const otherDevices = await libloki.storage.getPairedDevicesFor(
+        devicePubKey
+      );
       const allDevices = [devicePubKey, ...otherDevices];
 
       // Set profile name to primary conversation
       let profileName;
-      const allConversationsWithUser = allDevices.map(d =>
+      const allConversationsWithUser = allDevices
-        ConversationController.get(d)
+        .map(d => ConversationController.get(d))
-      ).filter(c => Boolean(c));
+        .filter(c => Boolean(c));
       allConversationsWithUser.forEach(conversation => {
         // If we somehow received an old friend request (e.g. after having restored
         // from seed, we won't be able to accept it, we should initiate our own
@@ -445,7 +447,9 @@
 
       // If you don't have a profile name for this device, and profileName is set,
       // add profileName to conversation.
-      const primaryDevicePubKey = (await libloki.storage.getPrimaryDeviceFor(devicePubKey)) || devicePubKey;
+      const primaryDevicePubKey =
+        (await libloki.storage.getPrimaryDeviceFor(devicePubKey)) ||
+        devicePubKey;
       const primaryConversation = allConversationsWithUser.find(
         c => c.id === primaryDevicePubKey
       );
@@ -477,11 +481,13 @@
       });
 
       const devicePubKey = this.attributes.conversationId;
-      const otherDevices = await libloki.storage.getPairedDevicesFor(devicePubKey);
+      const otherDevices = await libloki.storage.getPairedDevicesFor(
+        devicePubKey
+      );
       const allDevices = [devicePubKey, ...otherDevices];
-      const allConversationsWithUser = allDevices.map(d =>
+      const allConversationsWithUser = allDevices
-        ConversationController.get(d)
+        .map(d => ConversationController.get(d))
-      ).filter(c => Boolean(c));
+        .filter(c => Boolean(c));
       allConversationsWithUser.forEach(conversation => {
         conversation.onDeclineFriendRequest();
       });

libtextsecure/outgoing_message.js

@@ -215,11 +215,7 @@ OutgoingMessage.prototype = {
     this.errors[this.errors.length] = error;
     this.numberCompleted();
   },
-  reloadDevicesAndSend(
+  reloadDevicesAndSend(primaryPubKey, multiDevice = true) {
-    primaryPubKey,
-    multiDevice = true,
-    excludedDevices = []
-  ) {
     const ourNumber = textsecure.storage.user.getNumber();
 
     if (!multiDevice) {
@@ -235,9 +231,7 @@ OutgoingMessage.prototype = {
         .getAllDevicePubKeysForPrimaryPubKey(primaryPubKey)
         // Don't send to ourselves
         .then(devicesPubKeys =>
-          devicesPubKeys.filter(
+          devicesPubKeys.filter(pubKey => pubKey !== ourNumber)
-            pubKey => pubKey !== ourNumber && !excludedDevices.includes(pubKey)
-          )
         )
         .then(devicesPubKeys => {
           if (devicesPubKeys.length === 0) {
@@ -706,18 +700,14 @@ OutgoingMessage.prototype = {
     return promise;
   },
 
-  sendToNumber(number, multiDevice = true, excludedDevices = []) {
+  sendToNumber(number, multiDevice = true) {
     let conversation;
     try {
       conversation = ConversationController.get(number);
     } catch (e) {
       // do nothing
     }
-    return this.reloadDevicesAndSend(
+    return this.reloadDevicesAndSend(number, multiDevice).catch(error => {
-      number,
-      multiDevice,
-      excludedDevices
-    ).catch(error => {
       conversation.resetPendingSend();
       if (error.message === 'Identity key changed') {
         // eslint-disable-next-line no-param-reassign