summary refs log tree commit diff
path: root/synapse/handlers/initial_sync.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-02-18 23:14:57 +0000
committerRichard van der Hoff <richard@matrix.org>2020-02-19 08:52:51 +0000
commita0a1fd0bec5cb596cc41c8f052a4aa0e8c01cf08 (patch)
treeaabbdd6e13848ab8bc4b263dfce1df3e19efc65d /synapse/handlers/initial_sync.py
parentRefactor the membership check methods in Auth (diff)
downloadsynapse-a0a1fd0bec5cb596cc41c8f052a4aa0e8c01cf08.tar.xz
Add `allow_departed_users` param to `check_in_room_or_world_readable`
... and set it everywhere it's called.

while we're here, rename it for consistency with `check_user_in_room` (and to
help check that I haven't missed any instances)
Diffstat (limited to 'synapse/handlers/initial_sync.py')
-rw-r--r--synapse/handlers/initial_sync.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/handlers/initial_sync.py b/synapse/handlers/initial_sync.py

index b7c6a921d9..b116500c7d 100644 --- a/synapse/handlers/initial_sync.py +++ b/synapse/handlers/initial_sync.py
@@ -277,7 +277,9 @@ class InitialSyncHandler(BaseHandler): ( membership, member_event_id, - ) = await self.auth.check_user_in_room_or_world_readable(room_id, user_id) + ) = await self.auth.check_user_in_room_or_world_readable( + room_id, user_id, allow_departed_users=True, + ) is_peeking = member_event_id is None if membership == Membership.JOIN: