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/rest | |
| 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/rest')
| -rw-r--r-- | synapse/rest/client/v2_alpha/sync.py | 3 |
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, |