From 8321695888634193422e2958972edd568fde2462 Mon Sep 17 00:00:00 2001
From: Andrew Ferrazzutti <andrewf@element.io>
Date: Tue, 12 Nov 2024 13:56:57 -0500
Subject: [PATCH 1/2] Trigger call rejoin attempt only if you were in it

Many membership events may get synced while your own join attempt is
being processed, during which you will not be in the call membership
list.  So, only try to rejoin if it seems that you have _left_ the call,
not when you are not (yet) in the call.
---
 src/matrixrtc/MatrixRTCSession.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/matrixrtc/MatrixRTCSession.ts b/src/matrixrtc/MatrixRTCSession.ts
index 046591ede17..083de439152 100644
--- a/src/matrixrtc/MatrixRTCSession.ts
+++ b/src/matrixrtc/MatrixRTCSession.ts
@@ -871,7 +871,11 @@ export class MatrixRTCSession extends TypedEventEmitter<MatrixRTCSessionEvent, M
             logger.info(`Memberships for call in room ${this.room.roomId} have changed: emitting`);
             this.emit(MatrixRTCSessionEvent.MembershipsChanged, oldMemberships, this.memberships);
 
-            if (this.isJoined() && !this.memberships.some(this.isMyMembership)) {
+            if (
+                this.isJoined() &&
+                oldMemberships.some(this.isMyMembership) &&
+                !this.memberships.some(this.isMyMembership)
+            ) {
                 logger.warn("Missing own membership: force re-join");
                 // TODO: Should this be awaited? And is there anything to tell the focus?
                 this.triggerCallMembershipEventUpdate();

From d48ee922077112abda6c227037116c3d4429d895 Mon Sep 17 00:00:00 2001
From: Andrew Ferrazzutti <andrewf@element.io>
Date: Tue, 12 Nov 2024 15:50:31 -0500
Subject: [PATCH 2/2] Add comments

---
 src/matrixrtc/MatrixRTCSession.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/matrixrtc/MatrixRTCSession.ts b/src/matrixrtc/MatrixRTCSession.ts
index 083de439152..b98cb1394ff 100644
--- a/src/matrixrtc/MatrixRTCSession.ts
+++ b/src/matrixrtc/MatrixRTCSession.ts
@@ -872,10 +872,11 @@ export class MatrixRTCSession extends TypedEventEmitter<MatrixRTCSessionEvent, M
             this.emit(MatrixRTCSessionEvent.MembershipsChanged, oldMemberships, this.memberships);
 
             if (
-                this.isJoined() &&
-                oldMemberships.some(this.isMyMembership) &&
-                !this.memberships.some(this.isMyMembership)
+                this.isJoined() && // we mean to be joined
+                oldMemberships.some(this.isMyMembership) && // prior state says we were joined
+                !this.memberships.some(this.isMyMembership) // current says we are not joined
             ) {
+                // State says that we left, but we still mean to be joined
                 logger.warn("Missing own membership: force re-join");
                 // TODO: Should this be awaited? And is there anything to tell the focus?
                 this.triggerCallMembershipEventUpdate();