summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2021-08-09 14:44:28 +0100
committerBrendan Abolivier <babolivier@matrix.org>2021-08-09 14:44:28 +0100
commitf8e86b7d2e8670e9688db806ff5a9b97c9ad5365 (patch)
treefd9b350b10b2480b0b9b41dc1ceca6f75796bdc8 /synapse/handlers
parentConvert Transaction and Edu object to attrs (#10542) (diff)
parent 1.40.0rc3 (diff)
downloadsynapse-f8e86b7d2e8670e9688db806ff5a9b97c9ad5365.tar.xz
Merge branch 'release-v1.40' into develop
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/event_auth.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/event_auth.py b/synapse/handlers/event_auth.py

index 53fac1f8a3..e2410e482f 100644 --- a/synapse/handlers/event_auth.py +++ b/synapse/handlers/event_auth.py
@@ -240,7 +240,7 @@ class EventAuthHandler: # If the join rule is not restricted, this doesn't apply. join_rules_event = await self._store.get_event(join_rules_event_id) - return join_rules_event.content.get("join_rule") == JoinRules.MSC3083_RESTRICTED + return join_rules_event.content.get("join_rule") == JoinRules.RESTRICTED async def get_rooms_that_allow_join( self, state_ids: StateMap[str]