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

fix a case of rampaging SYWEB-78

pull/10/head
Matthew Hodgson 2014-09-23 16:39:41 +01:00
parent a7420ff2b5
commit 5aa13b9084
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,6 +68,9 @@ angular.module('matrixFilter', [])
else { else {
// The other member may be in the invite list, get all invited users // The other member may be in the invite list, get all invited users
var invitedUserIDs = []; var invitedUserIDs = [];
// XXX: *SURELY* we shouldn't have to trawl through the whole messages list to
// find invite - surely the other user should be in room.members with state invited? :/ --Matthew
for (var i in room.messages) { for (var i in room.messages) {
var message = room.messages[i]; var message = room.messages[i];
if ("m.room.member" === message.type && "invite" === message.membership) { if ("m.room.member" === message.type && "invite" === message.membership) {
@ -91,6 +94,8 @@ angular.module('matrixFilter', [])
} }
} }
if (!otherUserId) otherUserId = user_id; // name the room after ourselves as we're the only person there!
// Try to resolve his displayname in presence global data // Try to resolve his displayname in presence global data
if (otherUserId in $rootScope.presence) { if (otherUserId in $rootScope.presence) {
roomName = $rootScope.presence[otherUserId].content.displayname; roomName = $rootScope.presence[otherUserId].content.displayname;