From 8718a7139b902e684aac97023fd6f6f8394b11f8 Mon Sep 17 00:00:00 2001
From: Andrew Ferrazzutti <andrewf@element.io>
Date: Tue, 7 May 2024 16:58:30 +0900
Subject: [PATCH] Don't auto-join knock room on invite after leave (#2362)

If you send a knock that is rejected, or your knock is accepted and you
are later removed from the room, do not automatically accept subsequent
invites to that room.

Note that the auto-join behaviour happened only if the page was not
refreshed after sending a knock.
---
 src/room/useLoadGroupCall.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/room/useLoadGroupCall.ts b/src/room/useLoadGroupCall.ts
index ed38eaed..d913c3c9 100644
--- a/src/room/useLoadGroupCall.ts
+++ b/src/room/useLoadGroupCall.ts
@@ -168,7 +168,10 @@ export const useLoadGroupCall = (
           async (room, membership, prevMembership) => {
             if (roomId !== room.roomId) return;
             activeRoom.current = room;
-            if (membership === KnownMembership.Invite) {
+            if (
+              membership === KnownMembership.Invite &&
+              prevMembership === KnownMembership.Knock
+            ) {
               await client.joinRoom(room.roomId, { viaServers });
               joinedRoom = room;
               logger.log("Auto-joined %s", room.roomId);