diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2021-12-06 10:51:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-06 15:51:15 +0000 |
| commit | 494ebd7347ba52d702802fba4c3bb13e7bfbc2cf (patch) | |
| tree | 96d7557a491d244d98c45549a92068f7c5e4e47f /synapse/rest/admin | |
| parent | Move `glob_to_regex` and `re_word_boundary` to `matrix-python-common` (#11505) (diff) | |
| download | synapse-494ebd7347ba52d702802fba4c3bb13e7bfbc2cf.tar.xz | |
Include bundled aggregations in /sync and related fixes (#11478)
Due to updates to MSC2675 this includes a few fixes: * Include bundled aggregations for /sync. * Do not include bundled aggregations for /initialSync and /events. * Do not bundle aggregations for state events. * Clarifies comments and variable names.
Diffstat (limited to 'synapse/rest/admin')
| -rw-r--r-- | synapse/rest/admin/rooms.py | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/synapse/rest/admin/rooms.py b/synapse/rest/admin/rooms.py index 6bbc5510f0..669ab44a45 100644 --- a/synapse/rest/admin/rooms.py +++ b/synapse/rest/admin/rooms.py @@ -449,13 +449,7 @@ class RoomStateRestServlet(RestServlet): event_ids = await self.store.get_current_state_ids(room_id) events = await self.store.get_events(event_ids.values()) now = self.clock.time_msec() - room_state = await self._event_serializer.serialize_events( - events.values(), - now, - # We don't bother bundling aggregations in when asked for state - # events, as clients won't use them. - bundle_relations=False, - ) + room_state = await self._event_serializer.serialize_events(events.values(), now) ret = {"state": room_state} return HTTPStatus.OK, ret @@ -789,10 +783,7 @@ class RoomEventContextServlet(RestServlet): results["events_after"], time_now ) results["state"] = await self._event_serializer.serialize_events( - results["state"], - time_now, - # No need to bundle aggregations for state events - bundle_relations=False, + results["state"], time_now ) return HTTPStatus.OK, results |