fix room not having access to event mapper + tests

spec/unit/room.spec.js

@@ -1274,6 +1274,35 @@ describe("Room", function() {
     });
 
     describe("loadOutOfBandMembers", function() {
+        const memberEvent = utils.mkMembership({
+            user: "@user_a:bar", mship: "join",
+            room: roomId, event: true, name: "User A",
+        });
+
+        it("should apply member events", async function() {
+            const room = new Room(roomId);
+            await room.loadOutOfBandMembers(Promise.resolve([memberEvent]));
+            const memberA = room.getMember("@user_a:bar");
+            expect(memberA.name).toEqual("User A");
+        });
+
+        it("should apply first call, not first resolved promise", async function() {
+            const memberEvent2 = utils.mkMembership({
+                user: "@user_a:bar", mship: "join",
+                room: roomId, event: true, name: "Ms A",
+            });
+            const room = new Room(roomId);
+
+            const promise2 = Promise.resolve([memberEvent2])
+            const promise1 = promise2.then(() => [memberEvent]);
+
+            await room.loadOutOfBandMembers(promise1);
+            await room.loadOutOfBandMembers(promise2);
+
+            const memberA = room.getMember("@user_a:bar");
+            expect(memberA.name).toEqual("User A");
+        });
+
         it("should revert needs loading on error", async function() {
             const room = new Room(roomId);
             let hasThrown = false;

src/client.js

@@ -770,7 +770,9 @@ MatrixClient.prototype.loadRoomMembersIfNeeded = async function(roomId) {
 
     const lastEventId = room.getLastEventId();
     const responsePromise = this.members(roomId, "join", "leave", lastEventId);
-    const eventsPromise = responsePromise.then((response) => response.chunk);
+    const eventsPromise = responsePromise.then((response) => {
+        return response.chunk.map(this.getEventMapper())
+    });
     await room.loadOutOfBandMembers(eventsPromise);
 };
 

src/models/room.js

@@ -232,21 +232,20 @@ Room.prototype.needsOutOfBandMembers = function() {
 
 /**
  * Loads the out-of-band members from the promise passed in
- * @param {Promise} eventsPromise promise with array with state events
+ * @param {Promise<[MatrixEvent]>} eventsPromise state events for members
  */
 Room.prototype.loadOutOfBandMembers = async function(eventsPromise) {
-    if (!this.membersNeedLoading()) {
+    if (!this.needsOutOfBandMembers()) {
         return;
     }
     this.currentState.markOutOfBandMembersStarted();
-    let eventPojos = null;
+    let events = null;
     try {
-        eventPojos = await eventsPromise;
+        events = await eventsPromise;
     } catch (err) {
         this.currentState.markOutOfBandMembersFailed();
         throw err;  //rethrow so calling code is aware operation failed
     }
-    const events = eventPojos.map(this.client.getEventMapper());
     this.currentState.setOutOfBandMembers(events);
 };