OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

getUserDisplayName: Disambiguate users who have the same displayname in the room. 

Displayname are then disambiguate where it is necessary
pull/10/head
Emmanuel ROHEE 2014-09-25 11:45:01 +02:00
parent 72eb360f2d
commit ef99a5d972
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
webclient/components/matrix/event-handler-service.js
View File

@ -373,6 +373,21 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
var member = getMember(room_id, user_id); var member = getMember(room_id, user_id);
if (member && member.content.displayname) { // Do not consider null displayname if (member && member.content.displayname) { // Do not consider null displayname
displayName = member.content.displayname; displayName = member.content.displayname;
// Disambiguate users who have the same displayname in the room
if (user_id !== matrixService.config().user_id) {
var room = $rootScope.events.rooms[room_id];
for (var member_id in room.members) {
if (room.members.hasOwnProperty(member_id) && member_id !== user_id) {
var member2 = room.members[member_id];
if (member2.content.displayname && member2.content.displayname === displayName) {
displayName = displayName + " (" + user_id + ")";
break;
}
}
}
}
} }
// The user may not have joined the room yet. So try to resolve display name from presence data // The user may not have joined the room yet. So try to resolve display name from presence data