address review: remove code duplication

5 years ago · 6d6f4a00e4
parent a3575c0295
commit 6d6f4a00e4
1 changed files with 6 additions and 13 deletions
--- a/js/views/invite_friends_dialog_view.js
+++ b/js/views/invite_friends_dialog_view.js
@ -14,19 +14,12 @@

      const convos = window.getConversations().models;

-      if (convo.isPublic()) {
-        this.friends = convos.filter(
-          d => !!d && d.isFriend() && d.isPrivate() && !d.isMe()
-        );
-      } else {
-        this.friends = convos.filter(
-          d =>
-            !!d &&
-            d.isFriend() &&
-            d.isPrivate() &&
-            !d.isMe() &&
-            !convo.get('members').includes(d.id)
-        );
+      this.friends = convos.filter(
+        d => !!d && d.isFriend() && d.isPrivate() && !d.isMe()
+      );
+      if (!convo.isPublic()) {
+        const members = convo.get('members') || [];
+        this.friends = this.friends.filter(d => !members.includes(d.id));
      }

      this.chatName = convo.get('name');