diff options
| author | Erik Johnston <erik@matrix.org> | 2019-05-21 13:54:09 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-05-21 13:54:09 +0100 |
| commit | de7672b78f4dc250f7cfe151f4185bf186f3728c (patch) | |
| tree | 0ad47dba5af858bfd5a71943d61cd8d098032c02 /synapse/handlers | |
| parent | Fix error handling for rooms whose versions are unknown. (#5219) (diff) | |
| download | synapse-de7672b78f4dc250f7cfe151f4185bf186f3728c.tar.xz | |
Don't bundle events in /sync or /events
As we'll send down the annotations too anyway, so this just ends up confusing clients.
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/events.py | 3 |
1 files changed, 3 insertions, 0 deletions
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 = { |