Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-10-01 11:49:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

SYWEB-112: Use the right user ID when determining invites for display on the recents list.

Browse Source
This commit is contained in:
Kegan Dougal 2014-10-30 10:05:43 +00:00
parent 0f192579ac
commit b4b492824e
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,6 @@ angular.module('matrixFilter', [])
else if (room.members && !isPublicRoom) { // Do not rename public room else if (room.members && !isPublicRoom) { // Do not rename public room
var user_id = matrixService.config().user_id; var user_id = matrixService.config().user_id;
// Else, build the name from its users // Else, build the name from its users
// Limit the room renaming to 1:1 room // Limit the room renaming to 1:1 room
if (2 === Object.keys(room.members).length) { if (2 === Object.keys(room.members).length) {
@ -65,8 +64,16 @@ angular.module('matrixFilter', [])
var otherUserId; var otherUserId;
if (Object.keys(room.members)[0] && Object.keys(room.members)[0] !== user_id) { if (Object.keys(room.members)[0]) {
otherUserId = Object.keys(room.members)[0]; otherUserId = Object.keys(room.members)[0];
// this could be an invite event (from event stream)
if (otherUserId === user_id &&
room.members[user_id].content.membership === "invite") {
// this is us being invited to this room, so the
// *user_id* is the other user ID and not the state
// key.
otherUserId = room.members[user_id].user_id;
}
} }
else { else {
// it's got to be an invite, or failing that a self-chat; // it's got to be an invite, or failing that a self-chat;