sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

suppress null member rejoins again

Browse Source 
reverts https://github.com/matrix-org/matrix-react-sdk/commit/f5fe4b24336a8245b5a08050fefe13b9999d92fb
should fix https://github.com/vector-im/riot-web/issues/3788
This commit is contained in:
Matthew Hodgson
2017-05-06 01:45:37 +01:00
parent 28e0a32d6c
commit 2b71123ddc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TextForEvent.js
+2 -2
View File
@@ -65,8 +65,8 @@ function textForMemberEvent(ev) {
} else if (!ev.getPrevContent().avatar_url && ev.getContent().avatar_url) { } else if (!ev.getPrevContent().avatar_url && ev.getContent().avatar_url) {
return senderName + " set a profile picture"; return senderName + " set a profile picture";
} else { } else {
// hacky hack for https://github.com/vector-im/vector-web/issues/2020 // suppress null rejoins
return senderName + " rejoined the room."; return '';
} }
} else { } else {
if (!ev.target) console.warn("Join message has no target! -- " + ev.getContent().state_key); if (!ev.target) console.warn("Join message has no target! -- " + ev.getContent().state_key);