1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-19 20:23:18 +03:00

fix shouldHideEvent saying an event is a leave/join when a profile change

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski
2018-02-22 16:14:56 +00:00
parent cf4ae681f4
commit 773fef7f1d

View File

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