diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2022-02-08 13:25:54 +0000 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2022-02-08 13:25:54 +0000 |
| commit | 0b561a0ea1384db214c274f45b160c538d2ab65d (patch) | |
| tree | aad71a937464551ac28cae53e36820f669431980 /synapse/rest/client/sync.py | |
| parent | Use changelog from develop (diff) | |
| parent | Fix wording (diff) | |
| download | synapse-0b561a0ea1384db214c274f45b160c538d2ab65d.tar.xz | |
Merge branch 'release-v1.52'
Diffstat (limited to 'synapse/rest/client/sync.py')
| -rw-r--r-- | synapse/rest/client/sync.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/rest/client/sync.py b/synapse/rest/client/sync.py index d20ae1421e..f9615da525 100644 --- a/synapse/rest/client/sync.py +++ b/synapse/rest/client/sync.py @@ -48,6 +48,7 @@ from synapse.http.server import HttpServer from synapse.http.servlet import RestServlet, parse_boolean, parse_integer, parse_string from synapse.http.site import SynapseRequest from synapse.logging.opentracing import trace +from synapse.storage.databases.main.relations import BundledAggregations from synapse.types import JsonDict, StreamToken from synapse.util import json_decoder @@ -526,7 +527,7 @@ class SyncRestServlet(RestServlet): def serialize( events: Iterable[EventBase], - aggregations: Optional[Dict[str, Dict[str, Any]]] = None, + aggregations: Optional[Dict[str, BundledAggregations]] = None, ) -> List[JsonDict]: return self._event_serializer.serialize_events( events, |