summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-01-13 14:19:22 +0000
committerRichard van der Hoff <richard@matrix.org>2016-01-13 16:42:14 +0000
commit49f33f64386954e08b8409842f28b449b011849e (patch)
treef88e43925281cf8a0d9faa620eb16d4d104a6062 /synapse/rest
parentSkip, rather than erroring, invalid guest requests (diff)
downloadsynapse-49f33f64386954e08b8409842f28b449b011849e.tar.xz
Add 'event' result to 'context' endpoint
... because the context isn't much use without the event.
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v1/room.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py
index 6fe53f70e5..62ce0f066b 100644
--- a/synapse/rest/client/v1/room.py
+++ b/synapse/rest/client/v1/room.py
@@ -402,10 +402,16 @@ class RoomEventContext(ClientV1RestServlet):
             user, room_id, event_id, limit, is_guest
         )
 
+        if not results:
+            raise SynapseError(
+                404, "Event not found.", errcode=Codes.NOT_FOUND
+            )
+
         time_now = self.clock.time_msec()
         results["events_before"] = [
             serialize_event(event, time_now) for event in results["events_before"]
         ]
+        results["event"] = serialize_event(results["event"], time_now)
         results["events_after"] = [
             serialize_event(event, time_now) for event in results["events_after"]
         ]