Fix and rename again

matrix-org · Aug 6, 2024 · a93754f · a93754f
1 parent bd4a5f9
commit a93754f
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/matrixrtc/MatrixRTCSession.ts b/src/matrixrtc/MatrixRTCSession.ts
@@ -920,7 +920,8 @@ export class MatrixRTCSession extends TypedEventEmitter<MatrixRTCSessionEvent, M
             return this.useLegacyMemberEvents;
         }
 
-        let containsOnlySessionMemberships = true;
+        let containsAnyOngoingSession = false;
+        let containsUnknownOngoingSession = false;
         for (const callMemberEvent of callMemberEvents.values()) {
             const content = callMemberEvent.getContent();
             if (Array.isArray(content["memberships"])) {
@@ -929,12 +930,12 @@ export class MatrixRTCSession extends TypedEventEmitter<MatrixRTCSessionEvent, M
                         return true;
                     }
                 }
-                // Ignore non-ongoing legacy calls
-            } else {
-                containsOnlySessionMemberships &&= "focus_active" in content;
+            } else if (Object.keys(content).length > 0) {
+                containsAnyOngoingSession ||= true;
+                containsUnknownOngoingSession ||= !("focus_active" in content);
             }
         }
-        return containsOnlySessionMemberships ? false : this.useLegacyMemberEvents;
+        return containsAnyOngoingSession && !containsUnknownOngoingSession ? false : this.useLegacyMemberEvents;
     }
 
     private makeMembershipStateKey(localUserId: string, localDeviceId: string): string {