diff options
author | Sean Quah <8349537+squahtx@users.noreply.github.com> | 2021-12-08 10:47:09 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-08 10:47:09 +0000 |
commit | 2e2f5c043e08da517d2673f87ba22597d5599268 (patch) | |
tree | 74df92690df6785819125886a2be6d42b4bb1098 /synapse/handlers/events.py | |
parent | Merge branch 'develop' into squah/leave_space_admin_api (diff) | |
parent | Send and handle cross-signing messages using the stable prefix. (#10520) (diff) | |
download | synapse-github/squah/leave_space_admin_api.tar.xz |
Merge branch 'develop' into squah/leave_space_admin_api github/squah/leave_space_admin_api squah/leave_space_admin_api
Diffstat (limited to 'synapse/handlers/events.py')
-rw-r--r-- | synapse/handlers/events.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py index b4ff935546..32b0254c5f 100644 --- a/synapse/handlers/events.py +++ b/synapse/handlers/events.py @@ -122,9 +122,8 @@ class EventStreamHandler: 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_relations=False, + # Don't bundle aggregations as this is a deprecated API. + bundle_aggregations=False, ) chunk = { |