matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-07-30 04:23:07 +03:00
Code Activity

replace getMember(myId).membership with getMyMembership

Browse Source 
This works with rooms which haven't had their members
loaded yet.
This commit is contained in:
Bruno Windels
2018-08-02 11:37:43 +02:00
parent c0f706a2a2
commit f55a2079bf
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/node/app.js
View File

@ -202,9 +202,9 @@ function printRoomList() {
dateStr = new Date(msg.getTs()).toISOString().replace( dateStr = new Date(msg.getTs()).toISOString().replace(
/T/, ' ').replace(/\..+/, ''); /T/, ' ').replace(/\..+/, '');
} }
var me = roomList[i].getMember(myUserId); var myMembership = roomList[i].getMyMembership();
if (me) { if (myMembership) {
fmt = fmts[me.membership]; fmt = fmts[myMembership];
} }
var roomName = fixWidth(roomList[i].name, 25); var roomName = fixWidth(roomList[i].name, 25);
print( print(

10
src/crypto/index.js
View File

@ -1008,14 +1008,8 @@ Crypto.prototype._getE2eRooms = function() {
} }
// ignore any rooms which we have left // ignore any rooms which we have left
const me = room.getMember(this._userId); const myMembership = room.getMyMembership();
if (!me || ( return myMembership === "join" || myMembership === "invite";
me.membership !== "join" && me.membership !== "invite"
)) {
return false;
}
return true;
}); });
}; };