Apply new ESLint rules to legacy code

js/models/blockedNumbers.js

@@ -2,8 +2,6 @@
 
 // eslint-disable-next-line func-names
 (function() {
-  'use strict';
-
   const BLOCKED_NUMBERS_ID = 'blocked';
   const BLOCKED_UUIDS_ID = 'blocked-uuids';
   const BLOCKED_GROUPS_ID = 'blocked-groups';

js/models/conversations.js

@@ -16,8 +16,6 @@
 
 // eslint-disable-next-line func-names
 (function() {
-  'use strict';
-
   window.Whisper = window.Whisper || {};
 
   const SEALED_SENDER = {
@@ -852,7 +850,7 @@
         { syncMessage: true }
       );
       const contactSendOptions = this.getSendOptions();
-      const options = Object.assign({}, sendOptions, contactSendOptions);
+      const options = { ...sendOptions, ...contactSendOptions };
 
       const promise = textsecure.storage.protocol.loadIdentityKey(e164);
       return promise.then(key =>

js/models/messages.js

@@ -16,8 +16,6 @@
 
 // eslint-disable-next-line func-names
 (function() {
-  'use strict';
-
   window.Whisper = window.Whisper || {};
 
   const {
@@ -157,42 +155,50 @@
           type: 'unsupportedMessage',
           data: this.getPropsForUnsupportedMessage(),
         };
-      } else if (this.isMessageHistoryUnsynced()) {
+      }
+      if (this.isMessageHistoryUnsynced()) {
         return {
           type: 'linkNotification',
           data: null,
         };
-      } else if (this.isExpirationTimerUpdate()) {
+      }
+      if (this.isExpirationTimerUpdate()) {
         return {
           type: 'timerNotification',
           data: this.getPropsForTimerNotification(),
         };
-      } else if (this.isKeyChange()) {
+      }
+      if (this.isKeyChange()) {
         return {
           type: 'safetyNumberNotification',
           data: this.getPropsForSafetyNumberNotification(),
         };
-      } else if (this.isVerifiedChange()) {
+      }
+      if (this.isVerifiedChange()) {
         return {
           type: 'verificationNotification',
           data: this.getPropsForVerificationNotification(),
         };
-      } else if (this.isGroupUpdate()) {
+      }
+      if (this.isGroupUpdate()) {
         return {
           type: 'groupNotification',
           data: this.getPropsForGroupNotification(),
         };
-      } else if (this.isEndSession()) {
+      }
+      if (this.isEndSession()) {
         return {
           type: 'resetSessionNotification',
           data: this.getPropsForResetSessionNotification(),
         };
-      } else if (this.isCallHistory()) {
+      }
+      if (this.isCallHistory()) {
         return {
           type: 'callHistory',
           data: this.getPropsForCallHistory(),
         };
-      } else if (this.isProfileChange()) {
+      }
+      if (this.isProfileChange()) {
         return {
           type: 'profileChange',
           data: this.getPropsForProfileChange(),
@@ -421,7 +427,8 @@
           ...basicProps,
           type: 'fromSync',
         };
-      } else if (sourceId && sourceId === ourId) {
+      }
+      if (sourceId && sourceId === ourId) {
         return {
           ...basicProps,
           type: 'fromMe',
@@ -875,14 +882,13 @@
       const thumbnailWithObjectUrl =
         !path && !objectUrl
           ? null
-          : Object.assign({}, attachment.thumbnail || {}, {
-              objectUrl: path || objectUrl,
-            });
+          : { ...(attachment.thumbnail || {}), objectUrl: path || objectUrl };
 
-      return Object.assign({}, attachment, {
+      return {
+        ...attachment,
         isVoiceMessage: Signal.Types.Attachment.isVoiceMessage(attachment),
         thumbnail: thumbnailWithObjectUrl,
-      });
+      };
     },
 
     getNotificationData() /* : { text: string, emoji?: string } */ {
@@ -916,7 +922,8 @@
             text: i18n('message--getDescription--disappearing-photo'),
             emoji: '📷',
           };
-        } else if (Attachment.isVideo(attachments)) {
+        }
+        if (Attachment.isVideo(attachments)) {
           return {
             text: i18n('message--getDescription--disappearing-video'),
             emoji: '🎥',
@@ -934,7 +941,8 @@
 
         if (groupUpdate.left === 'You') {
           return { text: i18n('youLeftTheGroup') };
-        } else if (groupUpdate.left) {
+        }
+        if (groupUpdate.left) {
           return {
             text: i18n('leftTheGroup', [
               this.getNameForNumber(groupUpdate.left),
@@ -1015,22 +1023,26 @@
             text: body || i18n('message--getNotificationText--gif'),
             emoji: '🎡',
           };
-        } else if (Attachment.isImage(attachments)) {
+        }
+        if (Attachment.isImage(attachments)) {
           return {
             text: body || i18n('message--getNotificationText--photo'),
             emoji: '📷',
           };
-        } else if (Attachment.isVideo(attachments)) {
+        }
+        if (Attachment.isVideo(attachments)) {
           return {
             text: body || i18n('message--getNotificationText--video'),
             emoji: '🎥',
           };
-        } else if (Attachment.isVoiceMessage(attachment)) {
+        }
+        if (Attachment.isVoiceMessage(attachment)) {
           return {
             text: body || i18n('message--getNotificationText--voice-message'),
             emoji: '🎤',
           };
-        } else if (Attachment.isAudio(attachments)) {
+        }
+        if (Attachment.isAudio(attachments)) {
           return {
             text: body || i18n('message--getNotificationText--audio-message'),
             emoji: '🔈',
@@ -2361,14 +2373,16 @@
 
             confirm();
             return;
-          } else if (isUpdate) {
+          }
+          if (isUpdate) {
             window.log.warn(
               `handleDataMessage: Received update transcript, but no existing entry for message ${message.idForLogging()}. Dropping.`
             );
 
             confirm();
             return;
-          } else if (existingMessage) {
+          }
+          if (existingMessage) {
             window.log.warn(
               `handleDataMessage: Received duplicate transcript for message ${message.idForLogging()}, but it was not an update transcript. Dropping.`
             );