diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-01-27 13:11:03 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-01-27 13:11:03 +0000 |
| commit | 0484d7f6e98507d7c2138aa7959e722912bb4769 (patch) | |
| tree | c567e8ea0586fa33a6ff2499855ee9b1a89a4ca4 /synapse/rest/client/v1/room.py | |
| parent | Minor changes to v2_alpha filter REST test to allow the setUp method to be sh... (diff) | |
| parent | Initial cut of a shared base class for REST unit tests (diff) | |
| download | synapse-0484d7f6e98507d7c2138aa7959e722912bb4769.tar.xz | |
Merge branch 'develop' into client_v2_filter
Diffstat (limited to 'synapse/rest/client/v1/room.py')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index f06e3ddb98..58b09b6fc1 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -21,6 +21,7 @@ from synapse.api.errors import SynapseError, Codes from synapse.streams.config import PaginationConfig from synapse.api.constants import EventTypes, Membership from synapse.types import UserID, RoomID, RoomAlias +from synapse.events.utils import serialize_event import json import logging @@ -363,6 +364,10 @@ class RoomInitialSyncRestServlet(ClientV1RestServlet): class RoomTriggerBackfill(ClientV1RestServlet): PATTERN = client_path_pattern("/rooms/(?P<room_id>[^/]*)/backfill$") + def __init__(self, hs): + super(RoomTriggerBackfill, self).__init__(hs) + self.clock = hs.get_clock() + @defer.inlineCallbacks def on_GET(self, request, room_id): remote_server = urllib.unquote( @@ -374,7 +379,9 @@ class RoomTriggerBackfill(ClientV1RestServlet): handler = self.handlers.federation_handler events = yield handler.backfill(remote_server, room_id, limit) - res = [self.hs.serialize_event(event) for event in events] + time_now = self.clock.time_msec() + + res = [serialize_event(event, time_now) for event in events] defer.returnValue((200, res)) |