From f55a2079bf23465721439c031027b60fa8e3fb8a Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Thu, 2 Aug 2018 11:37:43 +0200 Subject: [PATCH] replace getMember(myId).membership with getMyMembership This works with rooms which haven't had their members loaded yet. --- examples/node/app.js | 6 +++--- src/crypto/index.js | 10 ++-------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/examples/node/app.js b/examples/node/app.js index dcff22aac..fd486830b 100644 --- a/examples/node/app.js +++ b/examples/node/app.js @@ -202,9 +202,9 @@ function printRoomList() { dateStr = new Date(msg.getTs()).toISOString().replace( /T/, ' ').replace(/\..+/, ''); } - var me = roomList[i].getMember(myUserId); - if (me) { - fmt = fmts[me.membership]; + var myMembership = roomList[i].getMyMembership(); + if (myMembership) { + fmt = fmts[myMembership]; } var roomName = fixWidth(roomList[i].name, 25); print( diff --git a/src/crypto/index.js b/src/crypto/index.js index 4a9cbf7eb..273dcce70 100644 --- a/src/crypto/index.js +++ b/src/crypto/index.js @@ -1008,14 +1008,8 @@ Crypto.prototype._getE2eRooms = function() { } // ignore any rooms which we have left - const me = room.getMember(this._userId); - if (!me || ( - me.membership !== "join" && me.membership !== "invite" - )) { - return false; - } - - return true; + const myMembership = room.getMyMembership(); + return myMembership === "join" || myMembership === "invite"; }); };