diff options
author | Eric Eastwood <erice@element.io> | 2022-08-24 14:13:12 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-24 14:13:12 -0500 |
commit | d58615c82cec5bd866bedcb33e3e2a5d2a961c44 (patch) | |
tree | 0c876b95db99f6c927adc011120f6953c38e7d3e /synapse/handlers/events.py | |
parent | When loading current ids, sort by `stream_id` to avoid incorrect overwrite an... (diff) | |
download | synapse-d58615c82cec5bd866bedcb33e3e2a5d2a961c44.tar.xz |
Directly lookup local membership instead of getting all members in a room first (`get_users_in_room` mis-use) (#13608)
See https://github.com/matrix-org/synapse/pull/13575#discussion_r953023755
Diffstat (limited to 'synapse/handlers/events.py')
-rw-r--r-- | synapse/handlers/events.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py index ac13340d3a..949b69cb41 100644 --- a/synapse/handlers/events.py +++ b/synapse/handlers/events.py @@ -151,7 +151,7 @@ class EventHandler: """Retrieve a single specified event. Args: - user: The user requesting the event + user: The local user requesting the event room_id: The expected room id. We'll return None if the event's room does not match. event_id: The event ID to obtain. @@ -173,8 +173,11 @@ class EventHandler: if not event: return None - users = await self.store.get_users_in_room(event.room_id) - is_peeking = user.to_string() not in users + is_user_in_room = await self.store.check_local_user_in_room( + user_id=user.to_string(), room_id=event.room_id + ) + # The user is peeking if they aren't in the room already + is_peeking = not is_user_in_room filtered = await filter_events_for_client( self._storage_controllers, user.to_string(), [event], is_peeking=is_peeking |