Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Include bundled aggregations in /sync and related fixes #11478

Merged
clokep merged 14 commits into from
Dec 6, 2021
Merged

Include bundled aggregations in /sync and related fixes #11478

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b8eae59
Rename bundle_relations to bundle_aggregations.
clokep Dec 1, 2021
278321d
Clarify comments about when to not bundle aggregations.
clokep Dec 1, 2021
6e0475d
Bundle aggregations for limited /sync requests.
clokep Dec 1, 2021
4a1e921
Do not bundle aggregations for initial_sync.
clokep Dec 1, 2021
d599b05
Consistently do not bundle aggregations for state events.
clokep Dec 1, 2021
313e272
Newsfragment
clokep Dec 1, 2021
a48bd2a
Never inlude bundled aggregations for state events.
clokep Dec 2, 2021
a11ef5b
Add tests.
clokep Dec 2, 2021
238d999
Merge remote-tracking branch 'origin/develop' into clokep/thread-bund…
clokep Dec 2, 2021
b7359c7
Clarify comments / newsfile.
clokep Dec 3, 2021
2f409da
Require args with defaults to be passed as kw-only.
clokep Dec 3, 2021
e98973d
Clarify comment.
clokep Dec 6, 2021
2e76df3
Only override bundled aggregations behavior where it differs from def…
clokep Dec 6, 2021
4ea1d51
Clarify comment.
clokep Dec 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions synapse/rest/client/sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,13 +516,13 @@ async def encode_room(
The room, encoded in our response format
"""

def serialize(events: Iterable[EventBase]) -> Awaitable[List[JsonDict]]:
def serialize(
events: Iterable[EventBase], bundle_aggregations: bool
) -> Awaitable[List[JsonDict]]:
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,
bundle_aggregations=bundle_aggregations,
token_id=token_id,
event_format=event_formatter,
only_event_fields=only_fields,
Expand All @@ -544,8 +544,13 @@ def serialize(events: Iterable[EventBase]) -> Awaitable[List[JsonDict]]:
event.room_id,
)

serialized_state = await serialize(state_events)
serialized_timeline = await serialize(timeline_events)
# No need to bundle aggregations for state events.
serialized_state = await serialize(state_events, bundle_aggregations=False)
# Only bundle aggregations if the room is limited, as clients could be
# missing events.
serialized_timeline = await serialize(
timeline_events, bundle_aggregations=not room.timeline.limited
)

account_data = room.account_data

Expand Down