From 1342bcedaf1ddf0f45009e7f771f51ee0c32ca6f Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 24 Oct 2014 16:14:47 +0100
Subject: switch from the deprecated msg.content.prev to
 msg.prev_content.membership, and fix the bug where kicks of unjoined users
 aren't displayed sensibly in the history

---
 webclient/room/room.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'webclient/room')

diff --git a/webclient/room/room.html b/webclient/room/room.html
index a3f8aee7ab..ce2c581903 100644
--- a/webclient/room/room.html
+++ b/webclient/room/room.html
@@ -91,11 +91,11 @@
                             <span ng-if="msg.user_id === msg.state_key">
                                 {{ members[msg.state_key].displayname || msg.state_key }} left
                             </span>
-                            <span ng-if="msg.user_id !== msg.state_key">
+                            <span ng-if="msg.user_id !== msg.state_key && msg.prev_content">
                                 {{ members[msg.user_id].displayname || msg.user_id }}
-                                {{ {"join": "kicked", "ban": "unbanned"}[msg.content.prev] }}
+                                {{ {"invite": "kicked", "join": "kicked", "ban": "unbanned"}[msg.prev_content.membership] }}
                                 {{ members[msg.state_key].displayname || msg.state_key }}
-                                <span ng-if="'join' === msg.content.prev && msg.content.reason">
+                                <span ng-if="'join' === msg.prev_content.membership && msg.content.reason">
                                     : {{ msg.content.reason }}
                                 </span>
                             </span>
@@ -105,7 +105,7 @@
                             {{ members[msg.user_id].displayname || msg.user_id }}
                             {{ {"invite": "invited", "ban": "banned"}[msg.content.membership] }}
                             {{ members[msg.state_key].displayname || msg.state_key }}
-                            <span ng-if="'ban' === msg.content.prev && msg.content.reason">
+                            <span ng-if="msg.prev_content && 'ban' === msg.prev_content.membership && msg.content.reason">
                                 : {{ msg.content.reason }}
                             </span>
                         </span>                        
-- 
cgit 1.4.1