diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-15 14:15:10 +0100 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-15 14:15:10 +0100 |
| commit | b0406b9ead0e3b726ef2c675181d040ca392e85d (patch) | |
| tree | 42fdeee7d4b5eb283f6a406463499ae05b9e5ffe /synapse/rest | |
| parent | Merge remote-tracking branch 'origin/develop' into test-sqlite-memory (diff) | |
| parent | Correctly handle the 'age' key in events and pdus (diff) | |
| download | synapse-b0406b9ead0e3b726ef2c675181d040ca392e85d.tar.xz | |
Merge remote-tracking branch 'origin/develop' into test-sqlite-memory
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/events.py | 2 | ||||
| -rw-r--r-- | synapse/rest/room.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/events.py b/synapse/rest/events.py index 7fde143200..097195d7cc 100644 --- a/synapse/rest/events.py +++ b/synapse/rest/events.py @@ -59,7 +59,7 @@ class EventRestServlet(RestServlet): event = yield handler.get_event(auth_user, event_id) if event: - defer.returnValue((200, event.get_dict())) + defer.returnValue((200, self.hs.serialize_event(event))) else: defer.returnValue((404, "Event not found.")) diff --git a/synapse/rest/room.py b/synapse/rest/room.py index cef700c81c..ecb1e346d9 100644 --- a/synapse/rest/room.py +++ b/synapse/rest/room.py @@ -378,7 +378,7 @@ class RoomTriggerBackfill(RestServlet): handler = self.handlers.federation_handler events = yield handler.backfill(remote_server, room_id, limit) - res = [event.get_dict() for event in events] + res = [self.hs.serialize_event(event) for event in events] defer.returnValue((200, res)) |