From ef99a5d972413014b5ab332cc89a25591990b9b1 Mon Sep 17 00:00:00 2001
From: Emmanuel ROHEE <erohee@amdocs.com>
Date: Thu, 25 Sep 2014 11:45:01 +0200
Subject: [PATCH] getUserDisplayName: Disambiguate users who have the same
displayname in the room. Displayname are then disambiguate where it is
necessary
---
.../components/matrix/event-handler-service.js | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js
index ea52db4f4a..e990d42d05 100644
--- a/webclient/components/matrix/event-handler-service.js
+++ b/webclient/components/matrix/event-handler-service.js
@@ -373,6 +373,21 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
var member = getMember(room_id, user_id);
if (member && member.content.displayname) { // Do not consider null 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
--
GitLab