From d4a98b38500b04286f274f552a2d9b8517da5be3 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Thu, 16 Jul 2015 17:57:57 +0100 Subject: [PATCH] Show correct membership messages for ban/unban. --- skins/base/views/molecules/MRoomMemberTile.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/skins/base/views/molecules/MRoomMemberTile.js b/skins/base/views/molecules/MRoomMemberTile.js index 92b6b119e3..51a22b08a5 100644 --- a/skins/base/views/molecules/MRoomMemberTile.js +++ b/skins/base/views/molecules/MRoomMemberTile.js @@ -36,10 +36,17 @@ module.exports = React.createClass({ switch (ev.getContent().membership) { case 'invite': return senderName + " invited " + targetName + "."; + case 'ban': + return senderName + " banned " + targetName + "."; case 'join': return targetName + " joined the room."; case 'leave': - return targetName + " left the room."; + if (ev.getSender() === ev.getStateKey()) { + return targetName + " left the room."; + } + else { + return senderName + " unbanned " + targetName + "."; + } } },