From 34c5787af065c910d45a76453b0c8f2b2765cdc3 Mon Sep 17 00:00:00 2001 From: Ginger Date: Wed, 4 Nov 2026 12:23:19 -0500 Subject: [PATCH] fix: Fix join rule evaluation for servers again Reviewed-by: timedout Reviewed-by: Jade Ellis --- src/service/rooms/membership/mod.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/service/rooms/membership/mod.rs b/src/service/rooms/membership/mod.rs index 67aee9ada..dd7263de0 100644 --- a/src/service/rooms/membership/mod.rs +++ b/src/service/rooms/membership/mod.rs @@ -901,7 +901,7 @@ impl Service { .server_in_room(self.services.globals.server_name(), condition_room) .await { - let is_joined = match entity { + let is_joined_to_condition_room = match entity { | JoinConditionEntity::User(user_id) => self.services .state_cache @@ -910,11 +910,11 @@ impl Service { | JoinConditionEntity::Server(server) => self.services .state_cache - .server_in_room(server, room_id) + .server_in_room(server, condition_room) .await, }; - if is_joined { + if is_joined_to_condition_room { debug!( ?entity, ?room_id,