OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

s/Membership/Member/ 

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/21833/head
Michael Telatynski 2017-08-10 13:58:19 +01:00
parent ffdffb643d
commit 1603360c13
No known key found for this signature in database
GPG Key ID: 0435A1D4BBD34D64
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/shouldHideEvent.js
View File

@ -16,10 +16,10 @@
function memberEventDiff(ev) { function memberEventDiff(ev) {
const diff = { const diff = {
isMembershipEvent: ev.getType() === 'm.room.member' && ev.getStateKey() !== undefined, isMemberEvent: ev.getType() === 'm.room.member' && ev.getStateKey() !== undefined,
}; };
if (!diff.isMembershipEvent) return diff; if (!diff.isMemberEvent) return diff;
const content = ev.getContent(); const content = ev.getContent();
const prevContent = ev.getPrevContent(); const prevContent = ev.getPrevContent();
@ -39,7 +39,7 @@ export default function(ev, syncedSettings) {
const eventDiff = memberEventDiff(ev); const eventDiff = memberEventDiff(ev);
if (eventDiff.isMembershipEvent) { if (eventDiff.isMemberEvent) {
if (syncedSettings['hideJoinLeaves'] && (eventDiff.isJoin || eventDiff.isPart)) return true; if (syncedSettings['hideJoinLeaves'] && (eventDiff.isJoin || eventDiff.isPart)) return true;
const isMemberAvatarDisplaynameChange = eventDiff.isAvatarChange || eventDiff.isDisplaynameChange; const isMemberAvatarDisplaynameChange = eventDiff.isAvatarChange || eventDiff.isDisplaynameChange;
if (syncedSettings['hideAvatarDisplaynameChanges'] && isMemberAvatarDisplaynameChange) return true; if (syncedSettings['hideAvatarDisplaynameChanges'] && isMemberAvatarDisplaynameChange) return true;