diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2014-10-24 16:14:47 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2014-10-24 16:14:47 +0100 |
| commit | 1342bcedaf1ddf0f45009e7f771f51ee0c32ca6f (patch) | |
| tree | 3288b0ba4adb7a2c359dff7b1257fe7db7368d9a /webclient/recents | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-1342bcedaf1ddf0f45009e7f771f51ee0c32ca6f.tar.xz | |
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
Diffstat (limited to 'webclient/recents')
| -rw-r--r-- | webclient/recents/recents.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webclient/recents/recents.html b/webclient/recents/recents.html index fe6a2f6368..a52b215c7e 100644 --- a/webclient/recents/recents.html +++ b/webclient/recents/recents.html @@ -42,12 +42,12 @@ <span ng-if="lastMsg.user_id === lastMsg.state_key"> {{lastMsg.state_key | mUserDisplayName: room.room_id }} left </span> - <span ng-if="lastMsg.user_id !== lastMsg.state_key"> + <span ng-if="lastMsg.user_id !== lastMsg.state_key && lastMsg.prev_content"> {{ lastMsg.user_id | mUserDisplayName: room.room_id }} - {{ {"join": "kicked", "ban": "unbanned"}[lastMsg.content.prev] }} + {{ {"invite": "kicked", "join": "kicked", "ban": "unbanned"}[lastMsg.prev_content.membership] }} {{ lastMsg.state_key | mUserDisplayName: room.room_id }} </span> - <span ng-if="'join' === lastMsg.content.prev && lastMsg.content.reason"> + <span ng-if="lastMsg.prev_content && 'join' === lastMsg.prev_content.membership && lastMsg.content.reason"> : {{ lastMsg.content.reason }} </span> </span> @@ -55,7 +55,7 @@ {{ lastMsg.user_id | mUserDisplayName: room.room_id }} {{ {"invite": "invited", "ban": "banned"}[lastMsg.content.membership] }} {{ lastMsg.state_key | mUserDisplayName: room.room_id }} - <span ng-if="'ban' === lastMsg.content.prev && lastMsg.content.reason"> + <span ng-if="lastMsg.prev_content && 'ban' === lastMsg.prev_content.membership && lastMsg.content.reason"> : {{ lastMsg.content.reason }} </span> </span> |