diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js
index 21066e3d9f..9c19f306c0 100644
--- a/webclient/components/matrix/event-handler-service.js
+++ b/webclient/components/matrix/event-handler-service.js
@@ -260,8 +260,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
if (event.content.prev !== event.content.membership) {
memberChanges = "membership";
}
- else if (event.prev_content.displayname !==
- event.content.displayname) {
+ else if (event.prev_content && (event.prev_content.displayname !== event.content.displayname)) {
memberChanges = "displayname";
}
diff --git a/webclient/components/matrix/matrix-filter.js b/webclient/components/matrix/matrix-filter.js
index 328e3a7086..1a64dc126c 100644
--- a/webclient/components/matrix/matrix-filter.js
+++ b/webclient/components/matrix/matrix-filter.js
@@ -49,15 +49,12 @@ angular.module('matrixFilter', [])
if (member.state_key !== user_id) {
if (member.state_key in $rootScope.presence) {
- // If the user is available in presence, use the displayname there
+ // If the user is listed in presence, use the displayname there
// as it is the most uptodate
- roomName = $rootScope.presence[member.state_key].content.displayname;
+ roomName = $rootScope.presence[member.state_key].content.displayname || member.state_key;
}
- else if (member.content.displayname) {
- roomName = member.content.displayname;
- }
- else {
- roomName = member.state_key;
+ else {
+ roomName = member.content.displayname || member.state_key;
}
}
}
diff --git a/webclient/components/matrix/matrix-service.js b/webclient/components/matrix/matrix-service.js
index 069e02e939..79781f5d86 100644
--- a/webclient/components/matrix/matrix-service.js
+++ b/webclient/components/matrix/matrix-service.js
@@ -697,11 +697,10 @@ angular.module('matrixService', [])
createRoomIdToAliasMapping: function(roomId, alias) {
roomIdToAlias[roomId] = alias;
aliasToRoomId[alias] = roomId;
- // localStorage.setItem(MAPPING_PREFIX+roomId, alias);
},
getRoomIdToAliasMapping: function(roomId) {
- var alias = roomIdToAlias[roomId]; // was localStorage.getItem(MAPPING_PREFIX+roomId)
+ var alias = roomIdToAlias[roomId];
//console.log("looking for alias for " + roomId + "; found: " + alias);
return alias;
},
|
