diff options
| author | Shay <hillerys@element.io> | 2022-08-24 14:18:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-24 14:18:31 -0700 |
| commit | 172b651832cea2d832beb5c4ff5bfae4581c8e63 (patch) | |
| tree | ebd49a80d21b84b51606da49d2a94241d4f1c13a /synapse/handlers/events.py | |
| parent | fix test to align with new behaviour (diff) | |
| parent | Rename `event_map` to `unpersisted_events` (#13603) (diff) | |
| download | synapse-172b651832cea2d832beb5c4ff5bfae4581c8e63.tar.xz | |
Merge branch 'develop' into shay/batch_events
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 |