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

Merge pull request #438 from matrix-org/rav/matrix_dev_hack 

Show something when we see a no-op join event
pull/21833/head
Matthew Hodgson 2016-09-02 16:58:29 +01:00 committed by GitHub
parent f9d8829ba2 f5fe4b2433
commit 8e9c04e1aa
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/TextForEvent.js
View File

@ -62,6 +62,9 @@ function textForMemberEvent(ev) {
return senderName + " changed their profile picture";
} else if (!ev.getPrevContent().avatar_url && ev.getContent().avatar_url) {
return senderName + " set a profile picture";
} else {
// hacky hack for https://github.com/vector-im/vector-web/issues/2020
return senderName + " rejoined the room.";
}
} else {
if (!ev.target) console.warn("Join message has no target! -- " + ev.getContent().state_key);