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/client/sync.py | |
| 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/client/sync.py')
| -rw-r--r-- | synapse/rest/client/sync.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/rest/client/sync.py b/synapse/rest/client/sync.py index b6a2485732..88e4f5e063 100644 --- a/synapse/rest/client/sync.py +++ b/synapse/rest/client/sync.py @@ -520,9 +520,9 @@ class SyncRestServlet(RestServlet): return self._event_serializer.serialize_events( events, time_now=time_now, - # We don't bundle "live" events, as otherwise clients - # will end up double counting annotations. - bundle_relations=False, + # Don't bother to bundle aggregations if the timeline is unlimited, + # as clients will have all the necessary information. + bundle_aggregations=room.timeline.limited, token_id=token_id, event_format=event_formatter, only_event_fields=only_fields, |