diff options
| author | Olivier Wilkinson (reivilibre) <oliverw@matrix.org> | 2021-12-14 14:22:01 +0000 |
|---|---|---|
| committer | Olivier Wilkinson (reivilibre) <oliverw@matrix.org> | 2021-12-14 14:22:01 +0000 |
| commit | 4dd9ea8f4fc002f35fa604361a792ea1d3d6671c (patch) | |
| tree | 1690b0d4658301b51907afeacf9e46bda7ce1152 /synapse/rest/client/sync.py | |
| parent | Revert accidental fast-forward merge from v1.49.0rc1 (diff) | |
| download | synapse-4dd9ea8f4fc002f35fa604361a792ea1d3d6671c.tar.xz | |
Revert "Revert accidental fast-forward merge from v1.49.0rc1"
This reverts commit 158d73ebdd61eef33831ae5f6990acf07244fc55.
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, |