Merge pull request #2118 from matrix-org/bwindels/feature_lazyloading

Lazy loading of room members
2018-08-16 18:14:55 +02:00
parent 936fba655a 86f60a803d
commit cead4096d8
21 changed files with 191 additions and 137 deletions
@@ -347,8 +347,8 @@ module.exports = React.createClass({
                if (!taggedRoom) {
                    return;
                }
-                const me = taggedRoom.getMember(MatrixClientPeg.get().credentials.userId);
-                if (HIDE_CONFERENCE_CHANS && Rooms.isConfCallRoom(taggedRoom, me, this.props.ConferenceHandler)) {
+                const myUserId = MatrixClientPeg.get().getUserId();
+                if (HIDE_CONFERENCE_CHANS && Rooms.isConfCallRoom(taggedRoom, myUserId, this.props.ConferenceHandler)) {
                    return;
                }