From de7672b78f4dc250f7cfe151f4185bf186f3728c Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 21 May 2019 13:54:09 +0100
Subject: Don't bundle events in /sync or /events

As we'll send down the annotations too anyway, so this just ends up
confusing clients.
---
 synapse/handlers/events.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'synapse/handlers')

diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py
index 6003ad9cca..eb525070cf 100644
--- a/synapse/handlers/events.py
+++ b/synapse/handlers/events.py
@@ -122,6 +122,9 @@ class EventStreamHandler(BaseHandler):
 
             chunks = yield self._event_serializer.serialize_events(
                 events, time_now, as_client_event=as_client_event,
+                # We don't bundle "live" events, as otherwise clients
+                # will end up double counting annotations.
+                bundle_aggregations=False,
             )
 
             chunk = {
-- 
cgit 1.5.1