PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Weblate 2018-02-28 16:58:32 +00:00
commit de727b37a8
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/shouldHideEvent.js
View file

@ -27,10 +27,11 @@ function memberEventDiff(ev) {
const content = ev.getContent(); const content = ev.getContent();
const prevContent = ev.getPrevContent(); const prevContent = ev.getPrevContent();
diff.isJoin = content.membership === 'join' && prevContent.membership !== 'ban'; const isMembershipChanged = content.membership !== prevContent.membership;
diff.isPart = content.membership === 'leave' && ev.getStateKey() === ev.getSender(); diff.isJoin = isMembershipChanged && content.membership === 'join';
diff.isPart = isMembershipChanged && content.membership === 'leave' && ev.getStateKey() === ev.getSender();
const isJoinToJoin = content.membership === prevContent.membership && content.membership === 'join'; const isJoinToJoin = !isMembershipChanged && content.membership === 'join';
diff.isDisplaynameChange = isJoinToJoin && content.displayname !== prevContent.displayname; diff.isDisplaynameChange = isJoinToJoin && content.displayname !== prevContent.displayname;
diff.isAvatarChange = isJoinToJoin && content.avatar_url !== prevContent.avatar_url; diff.isAvatarChange = isJoinToJoin && content.avatar_url !== prevContent.avatar_url;
return diff; return diff;