diff options
author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2019-07-09 13:43:08 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-09 13:43:08 +0100 |
commit | d88421ab03e72a6c7f69ca38a57b4b6212f1bc82 (patch) | |
tree | 64635f93fd52e229b5ee8667bf8164b297685057 /synapse/rest | |
parent | Merge pull request #5644 from matrix-org/babolivier/profile-allow-self (diff) | |
download | synapse-d88421ab03e72a6c7f69ca38a57b4b6212f1bc82.tar.xz |
Include the original event in /relations (#5626)
When asking for the relations of an event, include the original event in the response. This will mostly be used for efficiently showing edit history, but could be useful in other circumstances.
Diffstat (limited to 'synapse/rest')
-rw-r--r-- | synapse/rest/client/v2_alpha/relations.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/synapse/rest/client/v2_alpha/relations.py b/synapse/rest/client/v2_alpha/relations.py index 8e362782cc..458afd135f 100644 --- a/synapse/rest/client/v2_alpha/relations.py +++ b/synapse/rest/client/v2_alpha/relations.py @@ -145,9 +145,9 @@ class RelationPaginationServlet(RestServlet): room_id, requester.user.to_string() ) - # This checks that a) the event exists and b) the user is allowed to - # view it. - yield self.event_handler.get_event(requester.user, room_id, parent_id) + # This gets the original event and checks that a) the event exists and + # b) the user is allowed to view it. + event = yield self.event_handler.get_event(requester.user, room_id, parent_id) limit = parse_integer(request, "limit", default=5) from_token = parse_string(request, "from") @@ -173,10 +173,12 @@ class RelationPaginationServlet(RestServlet): ) now = self.clock.time_msec() + original_event = yield self._event_serializer.serialize_event(event, now) events = yield self._event_serializer.serialize_events(events, now) return_value = result.to_dict() return_value["chunk"] = events + return_value["original_event"] = original_event defer.returnValue((200, return_value)) |