summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorEric Eastwood <erice@element.io>2022-08-24 11:14:28 -0500
committerGitHub <noreply@github.com>2022-08-24 11:14:28 -0500
commitc807b814ae78b6adb5db6485a3ba7de79e36c826 (patch)
tree17bab9216586739d1f4b830984ab74e73d9d302e /synapse/handlers
parentFirst draft of triage_labelled action (#13612) (diff)
downloadsynapse-c807b814ae78b6adb5db6485a3ba7de79e36c826.tar.xz
Use dedicated `get_local_users_in_room` to find local users when calculating `join_authorised_via_users_server` of a `/make_join` request (#13606)
Use dedicated `get_local_users_in_room` to find local users when calculating `join_authorised_via_users_server` ("the authorising user for joining a restricted room") of a `/make_join` request.

Found while working on https://github.com/matrix-org/synapse/pull/13575#discussion_r953023755 but it's not related.
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/event_auth.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/synapse/handlers/event_auth.py b/synapse/handlers/event_auth.py
index a2dd9c7efa..c3ddc5d182 100644
--- a/synapse/handlers/event_auth.py
+++ b/synapse/handlers/event_auth.py
@@ -129,12 +129,9 @@ class EventAuthHandler:
         else:
             users = {}
 
-        # Find the user with the highest power level.
-        users_in_room = await self._store.get_users_in_room(room_id)
-        # Only interested in local users.
-        local_users_in_room = [
-            u for u in users_in_room if get_domain_from_id(u) == self._server_name
-        ]
+        # Find the user with the highest power level (only interested in local
+        # users).
+        local_users_in_room = await self._store.get_local_users_in_room(room_id)
         chosen_user = max(
             local_users_in_room,
             key=lambda user: users.get(user, users_default_level),