diff options
Diffstat (limited to 'webclient')
| -rw-r--r-- | webclient/components/matrix/matrix-filter.js | 33 | ||||
| -rw-r--r-- | webclient/recents/recents.html | 18 |
2 files changed, 42 insertions, 9 deletions
diff --git a/webclient/components/matrix/matrix-filter.js b/webclient/components/matrix/matrix-filter.js index a9bdbf66d9..0922684e3b 100644 --- a/webclient/components/matrix/matrix-filter.js +++ b/webclient/components/matrix/matrix-filter.js @@ -97,4 +97,37 @@ angular.module('matrixFilter', []) return roomName; }; +}]) + +// Compute the user display name in a room according to the data already downloaded +.filter('mUserDisplayName', ['$rootScope', function($rootScope) { + return function(user_id, room_id) { + var displayName; + + // Try to find the user name among presence data + // Warning: that means we have received before a presence event for this + // user which cannot be guaranted. + // However, if we get the info by this way, we are sure this is the latest user display name + // See FIXME comment below + if (user_id in $rootScope.presence) { + displayName = $rootScope.presence[user_id].content.displayname; + } + + // FIXME: Would like to use the display name as defined in room members of the room. + // But this information is the display name of the user when he has joined the room. + // It does not take into account user display name update + if (room_id) { + var room = $rootScope.events.rooms[room_id]; + if (room && (user_id in room.members)) { + var member = room.members[user_id]; + displayName = member.content.displayname; + } + } + + if (undefined === displayName) { + // By default, use the user ID + displayName = user_id; + } + return displayName; + }; }]); diff --git a/webclient/recents/recents.html b/webclient/recents/recents.html index a202473dd4..2e1f897725 100644 --- a/webclient/recents/recents.html +++ b/webclient/recents/recents.html @@ -19,35 +19,35 @@ <div ng-hide="room.membership === 'invite'" ng-switch="room.lastMsg.type" > <div ng-switch-when="m.room.member"> <span ng-if="'join' === room.lastMsg.content.membership"> - {{ room.lastMsg.state_key }} joined + {{ room.lastMsg.state_key | mUserDisplayName: room.room_id}} joined </span> <span ng-if="'leave' === room.lastMsg.content.membership"> <span ng-if="room.lastMsg.user_id === room.lastMsg.state_key"> - {{room.lastMsg.state_key }} left + {{room.lastMsg.state_key | mUserDisplayName: room.room_id }} left </span> <span ng-if="room.lastMsg.user_id !== room.lastMsg.state_key"> - {{ room.lastMsg.user_id }} + {{ room.lastMsg.user_id | mUserDisplayName: room.room_id }} {{ {"join": "kicked", "ban": "unbanned"}[room.lastMsg.content.prev] }} - {{ room.lastMsg.state_key }} + {{ room.lastMsg.state_key | mUserDisplayName: room.room_id }} </span> </span> <span ng-if="'invite' === room.lastMsg.content.membership || 'ban' === room.lastMsg.content.membership"> - {{ room.lastMsg.user_id }} + {{ room.lastMsg.user_id | mUserDisplayName: room.room_id }} {{ {"invite": "invited", "ban": "banned"}[room.lastMsg.content.membership] }} - {{ room.lastMsg.state_key }} + {{ room.lastMsg.state_key | mUserDisplayName: room.room_id }} </span> </div> <div ng-switch-when="m.room.message"> <div ng-switch="room.lastMsg.content.msgtype"> <div ng-switch-when="m.text"> - {{ room.lastMsg.user_id }} : + {{ room.lastMsg.user_id | mUserDisplayName: room.room_id }} : <span ng-bind-html="(room.lastMsg.content.body) | linky:'_blank'"> </span> </div> <div ng-switch-when="m.image"> - {{ room.lastMsg.user_id }} sent an image + {{ room.lastMsg.user_id | mUserDisplayName: room.room_id }} sent an image </div> <div ng-switch-when="m.emote"> @@ -62,7 +62,7 @@ </div> <div ng-switch-default> - <div ng-if="room.lastMsg.type.indexOf('m.call.') == 0"> + <div ng-if="room.lastMsg.type.indexOf('m.call.') === 0"> Call </div> </div> |