summary refs log tree commit diff
path: root/synapse/handlers/message.py
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/handlers/message.py
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/handlers/message.py')
-rw-r--r--synapse/handlers/message.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 792edc7579..0b02469ceb 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -166,6 +166,9 @@ class MessageHandler(object):
         now = self.clock.time_msec()
         events = yield self._event_serializer.serialize_events(
             room_state.values(), now,
+            # We don't bother bundling aggregations in when asked for state
+            # events, as clients won't use them.
+            bundle_aggregations=False,
         )
         defer.returnValue(events)