diff options
| author | Erik Johnston <erik@matrix.org> | 2022-05-20 12:47:43 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2022-05-20 12:51:53 +0100 |
| commit | 151cb6e2f4c114c605e5f4192adf2adc79f13a79 (patch) | |
| tree | c28bd3eced56dd3aee25cf245a007a2506a8016d | |
| parent | Use helper function elsewhere (diff) | |
| download | synapse-151cb6e2f4c114c605e5f4192adf2adc79f13a79.tar.xz | |
Use new store.get_current_state_event
| -rw-r--r-- | synapse/federation/federation_server.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 884b5d60b4..8c3fc7a457 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -1167,14 +1167,10 @@ class FederationServer(FederationBase): Raises: AuthError if the server does not match the ACL """ - state_ids = await self.store.get_current_state_ids(room_id) - acl_event_id = state_ids.get((EventTypes.ServerACL, "")) - - if not acl_event_id: - return - - acl_event = await self.store.get_event(acl_event_id) - if server_matches_acl_event(server_name, acl_event): + acl_event = await self.store.get_current_state_event( + room_id, EventTypes.ServerACL, "" + ) + if not acl_event or server_matches_acl_event(server_name, acl_event): return raise AuthError(code=403, msg="Server is banned from room") |