From bd4b40309dbb07814b1a505aecb1699559188fca Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 28 Feb 2018 00:49:14 +0000
Subject: [PATCH] fix based on PR review

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/shouldHideEvent.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/shouldHideEvent.js b/src/shouldHideEvent.js
index ae7be56c2e..3aad05a976 100644
--- a/src/shouldHideEvent.js
+++ b/src/shouldHideEvent.js
@@ -27,11 +27,11 @@ function memberEventDiff(ev) {
     const content = ev.getContent();
     const prevContent = ev.getPrevContent();
 
-    const isJoinToJoin = content.membership === prevContent.membership && content.membership === 'join';
-
-    diff.isJoin = !isJoinToJoin && content.membership === 'join' && prevContent.membership !== 'ban';
-    diff.isPart = !isJoinToJoin && content.membership === 'leave' && ev.getStateKey() === ev.getSender();
+    const isMembershipChanged = content.membership !== prevContent.membership;
+    diff.isJoin = isMembershipChanged && content.membership === 'join';
+    diff.isPart = isMembershipChanged && content.membership === 'leave' && ev.getStateKey() === ev.getSender();
 
+    const isJoinToJoin = !isMembershipChanged && content.membership === 'join';
     diff.isDisplaynameChange = isJoinToJoin && content.displayname !== prevContent.displayname;
     diff.isAvatarChange = isJoinToJoin && content.avatar_url !== prevContent.avatar_url;
     return diff;