diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2021-12-06 10:51:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-06 15:51:15 +0000 |
| commit | 494ebd7347ba52d702802fba4c3bb13e7bfbc2cf (patch) | |
| tree | 96d7557a491d244d98c45549a92068f7c5e4e47f /synapse/handlers/events.py | |
| parent | Move `glob_to_regex` and `re_word_boundary` to `matrix-python-common` (#11505) (diff) | |
| download | synapse-494ebd7347ba52d702802fba4c3bb13e7bfbc2cf.tar.xz | |
Include bundled aggregations in /sync and related fixes (#11478)
Due to updates to MSC2675 this includes a few fixes: * Include bundled aggregations for /sync. * Do not include bundled aggregations for /initialSync and /events. * Do not bundle aggregations for state events. * Clarifies comments and variable names.
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 = { |