From 395daf3aba9dcab04b212c8ab6bde3cfd54b4a35 Mon Sep 17 00:00:00 2001
From: Maxim Shishmarev <maxim@loki.network>
Date: Tue, 29 Oct 2019 10:15:59 +1100
Subject: [PATCH] Use Array.includes in place of Array.indexOf

---
 js/models/conversations.js                    |  2 +-
 js/models/messages.js                         | 20 ++++++++-----------
 js/modules/data.js                            |  2 +-
 js/views/create_group_dialog_view.js          |  2 +-
 .../conversation/UpdateGroupDialog.tsx        |  2 +-
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/js/models/conversations.js b/js/models/conversations.js
index 4d83ae806..85c78363a 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -2728,7 +2728,7 @@
         const knownMembers = this.get('members');
 
         if (knownMembers) {
-          const fromMember = knownMembers.indexOf(sender) !== -1;
+          const fromMember = knownMembers.includes(sender);
 
           if (!fromMember) {
             window.log.warn(
diff --git a/js/models/messages.js b/js/models/messages.js
index f5d02ecd5..bd6d76258 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -1744,7 +1744,7 @@
       const knownMembers = conversation.get('members');
 
       if (!newGroup && knownMembers) {
-        const fromMember = knownMembers.indexOf(source) !== -1;
+        const fromMember = knownMembers.includes(source);
 
         if (!fromMember) {
           window.log.warn(`Ignoring group message from non-member: ${source}`);
@@ -1766,8 +1766,7 @@
           );
         }
 
-        const fromAdmin =
-          conversation.get('groupAdmins').indexOf(source) !== -1;
+        const fromAdmin = conversation.get('groupAdmins').includes(source);
 
         if (!fromAdmin) {
           // Make sure the message is not removing members / renaming the group
@@ -1832,12 +1831,11 @@
 
       if (message.isFriendRequest() && backgroundFrReq) {
         // Check if the contact is a member in one of our private groups:
-        const groupMember =
-          window
-            .getConversations()
-            .models.filter(c => c.get('members'))
-            .reduce((acc, x) => window.Lodash.concat(acc, x.get('members')), [])
-            .indexOf(source) !== -1;
+        const groupMember = window
+          .getConversations()
+          .models.filter(c => c.get('members'))
+          .reduce((acc, x) => window.Lodash.concat(acc, x.get('members')), [])
+          .includes(source);
 
         if (groupMember) {
           window.log.info(
@@ -1914,9 +1912,7 @@
 
               if (removedMembers.length > 0) {
                 if (
-                  removedMembers.indexOf(
-                    textsecure.storage.user.getNumber()
-                  ) !== -1
+                  removedMembers.includes(textsecure.storage.user.getNumber())
                 ) {
                   groupUpdate.kicked = 'You';
                   attributes.isKickedFromGroup = true;
diff --git a/js/modules/data.js b/js/modules/data.js
index 5d15f9e31..e5d914cba 100644
--- a/js/modules/data.js
+++ b/js/modules/data.js
@@ -3,7 +3,7 @@
 const electron = require('electron');
 
 // TODO: this results in poor readability, would be
-// much better to implicitly call with `_`.
+// much better to explicitly call with `_`.
 const {
   cloneDeep,
   forEach,
diff --git a/js/views/create_group_dialog_view.js b/js/views/create_group_dialog_view.js
index 00daf53d5..0ff6e3205 100644
--- a/js/views/create_group_dialog_view.js
+++ b/js/views/create_group_dialog_view.js
@@ -102,7 +102,7 @@
 
       const ourPK = textsecure.storage.user.getNumber();
 
-      this.isAdmin = groupConvo.get('groupAdmins').indexOf(ourPK) !== -1;
+      this.isAdmin = groupConvo.get('groupAdmins').includes(ourPK);
 
       const convos = window.getConversations().models;
 
diff --git a/ts/components/conversation/UpdateGroupDialog.tsx b/ts/components/conversation/UpdateGroupDialog.tsx
index 182699ecb..53c31c4f5 100644
--- a/ts/components/conversation/UpdateGroupDialog.tsx
+++ b/ts/components/conversation/UpdateGroupDialog.tsx
@@ -45,7 +45,7 @@ export class UpdateGroupDialog extends React.Component<Props, State> {
       const lokiProfile = d.getLokiProfile();
       const name = lokiProfile ? lokiProfile.displayName : 'Anonymous';
 
-      const existingMember = this.props.existingMembers.indexOf(d.id) !== -1;
+      const existingMember = this.props.existingMembers.includes(d.id);
 
       return {
         id: d.id,