Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-05 06:14:57 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/release-v1.49' into develop

Browse source
This commit is contained in:
Richard van der Hoff 2021-12-20 16:34:01 +00:00
commit 8e4083e2f6
3 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
synapse/rest/client/sync.py
View file

@ -525,7 +525,15 @@ class SyncRestServlet(RestServlet):
time_now=time_now,
# Don't bother to bundle aggregations if the timeline is unlimited,
# as clients will have all the necessary information.
bundle_aggregations=room.timeline.limited,
# bundle_aggregations=room.timeline.limited,
#
# richvdh 2021-12-15: disable this temporarily as it has too high an
# overhead for initialsyncs. We need to figure out a way that the
# bundling can be done *before* the events are stored in the
# SyncResponseCache so that this part can be synchronous.
#
# Ensure to re-enable the test at tests/rest/client/test_relations.py::RelationsTestCase.test_bundled_aggregations.
bundle_aggregations=False,
token_id=token_id,
event_format=event_formatter,
only_event_fields=only_fields,