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

Show anything other than ban/invite -> leave as a kick

Browse source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2019-07-10 08:57:00 +01:00
parent 6cb148a88a
commit 8d4356a5b9
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/TextForEvent.js
View file

@ -100,15 +100,14 @@ function textForMemberEvent(ev) {
} }
} else if (prevContent.membership === "ban") { } else if (prevContent.membership === "ban") {
return _t('%(senderName)s unbanned %(targetName)s.', {senderName, targetName}); return _t('%(senderName)s unbanned %(targetName)s.', {senderName, targetName});
} else if (prevContent.membership === "join") {
return _t('%(senderName)s kicked %(targetName)s.', {senderName, targetName}) + ' ' + reason;
} else if (prevContent.membership === "invite") { } else if (prevContent.membership === "invite") {
return _t('%(senderName)s withdrew %(targetName)s\'s invitation.', { return _t('%(senderName)s withdrew %(targetName)s\'s invitation.', {
senderName, senderName,
targetName, targetName,
}) + ' ' + reason; }) + ' ' + reason;
} else { } else {
return _t('%(targetName)s left the room.', {targetName}); // 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;
} }
} }
} }

4
src/components/views/elements/MemberEventListSummary.js
View file

@ -345,8 +345,8 @@ module.exports = React.createClass({
switch (e.mxEvent.getPrevContent().membership) { switch (e.mxEvent.getPrevContent().membership) {
case 'invite': return 'invite_withdrawal'; case 'invite': return 'invite_withdrawal';
case 'ban': return 'unbanned'; case 'ban': return 'unbanned';
case 'join': return 'kicked'; // sender is not target and made the target leave, if not from invite/ban then this is a kick
default: return 'left'; default: return 'kicked';
} }
default: return null; default: return null;
} }