Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix one cause of SYWEB-53

This commit is contained in:
Matthew Hodgson 2014-09-23 16:11:12 +01:00
parent 2771efb51c
commit c9f73bd325
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
webclient/components/matrix/matrix-filter.js
View File

@ -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;
}
else if (member.content.displayname) {
roomName = member.content.displayname;
roomName = $rootScope.presence[member.state_key].content.displayname || member.state_key;
}
else {
roomName = member.state_key;
roomName = member.content.displayname || member.state_key;
}
}
}