summary refs log tree commit diff
path: root/synapse/rest/client/room.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2022-04-19 16:42:19 +0100
committerGitHub <noreply@github.com>2022-04-19 16:42:19 +0100
commitb80bb7e4526bd0425b3cdd10fa5633a5a4b4e05f (patch)
tree927d1d3ac64d54ae6365402d315b0c5917706f7d /synapse/rest/client/room.py
parentFix typo in deb changelogs from release script (#12497) (diff)
downloadsynapse-b80bb7e4526bd0425b3cdd10fa5633a5a4b4e05f.tar.xz
Fix `/room/.../event/...` to return the *original* event after any edits (#12476)
This is what the MSC (now) requires. Fixes https://github.com/matrix-org/synapse/issues/10310.
Diffstat (limited to 'synapse/rest/client/room.py')
-rw-r--r--synapse/rest/client/room.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/rest/client/room.py b/synapse/rest/client/room.py
index 47e152c8cc..937c323176 100644
--- a/synapse/rest/client/room.py
+++ b/synapse/rest/client/room.py
@@ -669,8 +669,10 @@ class RoomEventServlet(RestServlet):
             )
 
             time_now = self.clock.time_msec()
+            # per MSC2676, /rooms/{roomId}/event/{eventId}, should return the
+            # *original* event, rather than the edited version
             event_dict = self._event_serializer.serialize_event(
-                event, time_now, bundle_aggregations=aggregations
+                event, time_now, bundle_aggregations=aggregations, apply_edits=False
             )
             return 200, event_dict