imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5846 from matrix-org/t3chguy/fix/16822

Browse source 
Improve kick state to not show if the target was not joined to begin with
This commit is contained in:
Michael Telatynski 2021-04-12 14:45:13 +01:00 • committed by GitHub
commit 4aef7a879a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/TextForEvent.js
View file

@ -95,9 +95,10 @@ function textForMemberEvent(ev) {
senderName, senderName,
targetName, targetName,
}) + ' ' + reason; }) + ' ' + reason;
} else { } else if (prevContent.membership === "join") {
// sender is not target and made the target leave, if not from invite/ban then this is a kick
return _t('%(senderName)s kicked %(targetName)s.', {senderName, targetName}) + ' ' + reason; return _t('%(senderName)s kicked %(targetName)s.', {senderName, targetName}) + ' ' + reason;
} else {
return "";
} }
} }
} }