diff options
| author | Erik Johnston <erik@matrix.org> | 2024-07-26 12:57:17 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2024-07-26 12:57:37 +0100 |
| commit | 4c16874d05a57e98079b6dcbf627289e7a54949e (patch) | |
| tree | cf626f6fb5753fda85cf86f68815d0d0b15f3a62 /synapse | |
| parent | FIXUP (diff) | |
| download | synapse-4c16874d05a57e98079b6dcbf627289e7a54949e.tar.xz | |
REVERT
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/handlers/admin.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/initial_sync.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/search.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/sliding_sync.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/sync.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/synapse/handlers/admin.py b/synapse/handlers/admin.py index c04039a573..ec35784c5f 100644 --- a/synapse/handlers/admin.py +++ b/synapse/handlers/admin.py @@ -125,7 +125,7 @@ class AdminHandler: # Get all rooms the user is in or has been in rooms = await self._store.get_rooms_for_local_user_where_membership_is( user_id, - membership_list=frozenset(Membership.LIST), + membership_list=Membership.LIST, ) # We only try and fetch events for rooms the user has been in. If diff --git a/synapse/handlers/initial_sync.py b/synapse/handlers/initial_sync.py index 7ab4f2b67d..bd3c87f5f4 100644 --- a/synapse/handlers/initial_sync.py +++ b/synapse/handlers/initial_sync.py @@ -135,7 +135,7 @@ class InitialSyncHandler: memberships.append(Membership.LEAVE) room_list = await self.store.get_rooms_for_local_user_where_membership_is( - user_id=user_id, membership_list=frozenset(memberships) + user_id=user_id, membership_list=memberships ) user = UserID.from_string(user_id) diff --git a/synapse/handlers/search.py b/synapse/handlers/search.py index 8066132527..a7d52fa648 100644 --- a/synapse/handlers/search.py +++ b/synapse/handlers/search.py @@ -278,7 +278,7 @@ class SearchHandler: # TODO: Search through left rooms too rooms = await self.store.get_rooms_for_local_user_where_membership_is( requester.user.to_string(), - membership_list=(Membership.JOIN,), + membership_list=[Membership.JOIN], # membership_list=[Membership.JOIN, Membership.LEAVE, Membership.Ban], ) room_ids = {r.room_id for r in rooms} diff --git a/synapse/handlers/sliding_sync.py b/synapse/handlers/sliding_sync.py index 9f8fc6013b..474aaa6a4c 100644 --- a/synapse/handlers/sliding_sync.py +++ b/synapse/handlers/sliding_sync.py @@ -727,7 +727,7 @@ class SlidingSyncHandler: room_for_user_list = ( await self.store.get_rooms_for_local_user_where_membership_is( user_id=user_id, - membership_list=frozenset(Membership.LIST), + membership_list=Membership.LIST, excluded_rooms=self.rooms_to_exclude_globally, ) ) diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py index f66db4df78..ede014180c 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py @@ -2715,7 +2715,7 @@ class SyncHandler: room_list = await self.store.get_rooms_for_local_user_where_membership_is( user_id=user_id, - membership_list=frozenset(Membership.LIST), + membership_list=Membership.LIST, excluded_rooms=sync_result_builder.excluded_room_ids, ) |