diff options
| author | Erik Johnston <erik@matrix.org> | 2021-09-08 11:01:19 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2021-09-08 11:01:19 +0100 |
| commit | d381eae552b5b0a1f35fe55318517b29187d64db (patch) | |
| tree | ff02edf7baabcd1e48454ff77ab2feb9ef78aefa /synapse/handlers/event_auth.py | |
| parent | Defer verification to thread pool (diff) | |
| parent | Return stripped m.space.child events via the space summary. (#10760) (diff) | |
| download | synapse-d381eae552b5b0a1f35fe55318517b29187d64db.tar.xz | |
Merge remote-tracking branch 'origin/develop' into erikj/join_logging
Diffstat (limited to 'synapse/handlers/event_auth.py')
| -rw-r--r-- | synapse/handlers/event_auth.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/event_auth.py b/synapse/handlers/event_auth.py index 53fac1f8a3..4288ffff09 100644 --- a/synapse/handlers/event_auth.py +++ b/synapse/handlers/event_auth.py @@ -213,7 +213,7 @@ class EventAuthHandler: raise AuthError( 403, - "You do not belong to any of the required rooms to join this room.", + "You do not belong to any of the required rooms/spaces to join this room.", ) async def has_restricted_join_rules( @@ -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] |