Start a conference in a room with 2 people + invitee rather than a 1:…

…1 call (#7557)

* Start a conference call in a room with 2 people + invitee rather than a 1:1

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Fix tests

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

src/CallHandler.tsx

@@ -809,12 +809,13 @@ export default class CallHandler extends EventEmitter {
         // We leave the check for whether there's already a call in this room until later,
         // otherwise it can race.
 
-        const members = room.getJoinedMembers();
-        if (members.length <= 1) {
+        const joinedMemberCount = room.getJoinedMemberCount();
+        const invitedAndJoinedMemberCount = room.getInvitedAndJoinedMemberCount();
+        if (joinedMemberCount <= 1) {
             Modal.createTrackedDialog('Call Handler', 'Cannot place call with self', ErrorDialog, {
                 description: _t('You cannot place a call with yourself.'),
             });
-        } else if (members.length === 2) {
+        } else if (invitedAndJoinedMemberCount === 2) {
             logger.info(`Place ${type} call in ${roomId}`);
 
             this.placeMatrixCall(roomId, type, transferee);

test/CallHandler-test.ts

@@ -54,6 +54,8 @@ function mkStubDM(roomId, userId) {
             getMxcAvatarUrl: () => 'mxc://avatar.url/image.png',
         },
     ]);
+    room.getJoinedMemberCount = jest.fn().mockReturnValue(room.getJoinedMembers().length);
+    room.getInvitedAndJoinedMemberCount = jest.fn().mockReturnValue(room.getJoinedMembers().length);
     room.currentState.getMembers = room.getJoinedMembers;
 
     return room;