matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-16 22:01:54 +03:00
Code Activity

Add ability to render null-rejoins in Timeline and MELS

Browse Source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski
2019-06-23 21:41:28 +01:00
parent 1c7af38d83
commit f3641eaa32
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/TextForEvent.js
View File

@ -75,8 +75,8 @@ function textForMemberEvent(ev) {
} else if (!prevContent.avatar_url && content.avatar_url) {
return _t('%(senderName)s set a profile picture.', {senderName});
} else {
// suppress null rejoins
return '';
// This is a null rejoin, it will only be visible if the Labs option is enabled
return _t("%(senderName)s made no change.", {senderName});
}
} else {
if (!ev.target) console.warn("Join message has no target! -- " + ev.getContent().state_key);