diff options
| author | Emmanuel ROHEE <erohee@amdocs.com> | 2014-09-03 11:38:24 +0200 |
|---|---|---|
| committer | Emmanuel ROHEE <erohee@amdocs.com> | 2014-09-03 11:38:24 +0200 |
| commit | 4ba5b4b55d67b4188d551916e0707f456a6af787 (patch) | |
| tree | 8b9c528414f17a05a47e4f48a8bc2ccea206ad45 /webclient | |
| parent | Prefix API links with /docs/api/client-server so they should link through cor... (diff) | |
| download | synapse-4ba5b4b55d67b4188d551916e0707f456a6af787.tar.xz | |
Do not show banned people in member list. Format ban events strings in room and recent flows
Diffstat (limited to 'webclient')
| -rw-r--r-- | webclient/recents/recents.html | 4 | ||||
| -rw-r--r-- | webclient/room/room-controller.js | 5 | ||||
| -rw-r--r-- | webclient/room/room.html | 5 |
3 files changed, 10 insertions, 4 deletions
diff --git a/webclient/recents/recents.html b/webclient/recents/recents.html index db3b0fb32f..9978e08b13 100644 --- a/webclient/recents/recents.html +++ b/webclient/recents/recents.html @@ -23,8 +23,8 @@ <div ng-hide="room.membership === 'invite'" ng-switch="room.lastMsg.type" > <div ng-switch-when="m.room.member"> {{ room.lastMsg.user_id }} - {{ {"join": "joined", "leave": "left", "invite": "invited"}[room.lastMsg.content.membership] }} - {{ room.lastMsg.content.membership === "invite" ? (room.lastMsg.state_key || '') : '' }} + {{ {"join": "joined", "leave": "left", "invite": "invited", "ban": "banned"}[msg.content.membership] }} + {{ (msg.content.membership === "invite" || msg.content.membership === "ban") ? (msg.state_key || '') : '' }} </div> <div ng-switch-when="m.room.message"> diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js index fcd24c2749..48ddda62cc 100644 --- a/webclient/room/room-controller.js +++ b/webclient/room/room-controller.js @@ -161,6 +161,11 @@ angular.module('RoomController', ['ngSanitize', 'mFileInput']) var updateMemberList = function(chunk) { if (chunk.room_id != $scope.room_id) return; + // Ignore banned people + if ("ban" === chunk.membership) { + return; + } + // set target_user_id to keep things clear var target_user_id = chunk.state_key; diff --git a/webclient/room/room.html b/webclient/room/room.html index e672b1d7e2..05e87387a5 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -50,8 +50,9 @@ <div class="bubble"> <span ng-show='msg.type === "m.room.member"'> {{ members[msg.user_id].displayname || msg.user_id }} - {{ {"join": "joined", "leave": "left", "invite": "invited"}[msg.content.membership] }} - {{ msg.content.membership === "invite" ? (msg.state_key || '') : '' }} + {{ {"join": "joined", "leave": "left", "invite": "invited", "ban": "banned"}[msg.content.membership] }} + {{ (msg.content.membership === "invite" || msg.content.membership === "ban") ? (msg.state_key || '') : '' }} + </span> <span ng-show='msg.content.msgtype === "m.emote"' ng-bind-html="'* ' + (members[msg.user_id].displayname || msg.user_id) + ' ' + msg.content.body | linky:'_blank'"/> <span ng-show='msg.content.msgtype === "m.text"' ng-bind-html="((msg.content.msgtype === 'm.text') ? msg.content.body : '') | linky:'_blank'"/> |