From 6d6f4a00e4eed2cc29ddcc43497a4db3afdc2a17 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 14 Apr 2020 10:59:31 +1000 Subject: [PATCH] address review: remove code duplication --- js/views/invite_friends_dialog_view.js | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/js/views/invite_friends_dialog_view.js b/js/views/invite_friends_dialog_view.js index a5e52aec4..c4bec8b9f 100644 --- 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');