summary refs log tree commit diff
path: root/synapse/rest/client
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-05-24 10:36:31 +0100
committerGitHub <noreply@github.com>2019-05-24 10:36:31 +0100
commitd16f5574b608d7a34d36fafc64676731cb0fcba9 (patch)
treef76505893562b5e9f18f1bdbcdd05add34558646 /synapse/rest/client
parentMerge pull request #5244 from matrix-org/rav/server_keys/00-factor-out-fetchers (diff)
parentDon't bundle aggs for /state and /members etc APIs (diff)
downloadsynapse-d16f5574b608d7a34d36fafc64676731cb0fcba9.tar.xz
Merge pull request #5220 from matrix-org/erikj/dont_bundle_live_events
Don't bundle aggregations with events in /sync or /events or state queries
Diffstat (limited to 'synapse/rest/client')
-rw-r--r--synapse/rest/client/v2_alpha/sync.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py
index c701e534e7..d3025025e3 100644
--- a/synapse/rest/client/v2_alpha/sync.py
+++ b/synapse/rest/client/v2_alpha/sync.py
@@ -358,6 +358,9 @@ class SyncRestServlet(RestServlet):
         def serialize(events):
             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_aggregations=False,
                 token_id=token_id,
                 event_format=event_formatter,
                 only_event_fields=only_fields,