summary refs log tree commit diff
path: root/synapse/rest/client
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2022-01-21 05:31:31 -0500
committerGitHub <noreply@github.com>2022-01-21 10:31:31 +0000
commitb784299cbc121d27d7dadd0a4a96f4657244a4e9 (patch)
tree18869b2a4b52395c1a48e2dece958b65b83ec5b4 /synapse/rest/client
parentDrop unused table `public_room_list_stream`. (#11795) (diff)
downloadsynapse-b784299cbc121d27d7dadd0a4a96f4657244a4e9.tar.xz
Do not try to serialize raw aggregations dict. (#11791)
Diffstat (limited to 'synapse/rest/client')
-rw-r--r--synapse/rest/client/room.py11
1 files changed, 4 insertions, 7 deletions
diff --git a/synapse/rest/client/room.py b/synapse/rest/client/room.py
index 31fd329a38..90bb9142a0 100644
--- a/synapse/rest/client/room.py
+++ b/synapse/rest/client/room.py
@@ -714,18 +714,15 @@ class RoomEventContextServlet(RestServlet):
             raise SynapseError(404, "Event not found.", errcode=Codes.NOT_FOUND)
 
         time_now = self.clock.time_msec()
+        aggregations = results.pop("aggregations", None)
         results["events_before"] = self._event_serializer.serialize_events(
-            results["events_before"],
-            time_now,
-            bundle_aggregations=results["aggregations"],
+            results["events_before"], time_now, bundle_aggregations=aggregations
         )
         results["event"] = self._event_serializer.serialize_event(
-            results["event"], time_now, bundle_aggregations=results["aggregations"]
+            results["event"], time_now, bundle_aggregations=aggregations
         )
         results["events_after"] = self._event_serializer.serialize_events(
-            results["events_after"],
-            time_now,
-            bundle_aggregations=results["aggregations"],
+            results["events_after"], time_now, bundle_aggregations=aggregations
         )
         results["state"] = self._event_serializer.serialize_events(
             results["state"], time_now