From 5497dc36da88ff9657d8d94c8df27e2bf76706d4 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Sat, 15 Mar 2025 14:39:17 +0200
Subject: [PATCH] Don't allow server admins to bypass user_may_join_room
callback
It's mostly used to track accepting invites, not actually blocking joins,
so it should be able to track everyone.
---
synapse/handlers/room_member.py | 3 ---
1 file changed, 3 deletions(-)
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py
index ccfc7b979..d1782758b 100644
--- a/synapse/handlers/room_member.py
+++ b/synapse/handlers/room_member.py
@@ -1000,9 +1000,6 @@ class RoomMemberHandler(metaclass=abc.ABCMeta):
# allow the server notices mxid to join rooms
bypass_spam_checker = True
- else:
- bypass_spam_checker = await self.auth.is_server_admin(requester)
-
inviter = await self._get_inviter(target.to_string(), room_id)
if (
not bypass_spam_checker
--
GitLab