diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-11-18 16:02:44 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-11-18 16:02:44 +0000 |
| commit | 75e95c45a2da90528261c028e97e60a493106c5a (patch) | |
| tree | 27752b5e20cbe387bc2183db2adaee968f2e0922 /synapse | |
| parent | Merge remote-tracking branch 'origin/develop' into room-initial-sync (diff) | |
| download | synapse-75e95c45a2da90528261c028e97e60a493106c5a.tar.xz | |
Rename message handler's new snapshot_room to room_initial_sync() as that better suits its purpose
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/handlers/message.py | 2 | ||||
| -rw-r--r-- | synapse/rest/room.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index 21f9df30ec..081030dbb8 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -295,7 +295,7 @@ class MessageHandler(BaseHandler): defer.returnValue(ret) @defer.inlineCallbacks - def snapshot_room(self, user_id, room_id, pagin_config=None, + def room_initial_sync(self, user_id, room_id, pagin_config=None, feedback=False): yield self.auth.check_joined_room(room_id, user_id) diff --git a/synapse/rest/room.py b/synapse/rest/room.py index 393d6284f5..e656dd3f35 100644 --- a/synapse/rest/room.py +++ b/synapse/rest/room.py @@ -362,7 +362,7 @@ class RoomInitialSyncRestServlet(RestServlet): @defer.inlineCallbacks def on_GET(self, request, room_id): user = yield self.auth.get_user_by_req(request) - events = yield self.handlers.message_handler.snapshot_room( + events = yield self.handlers.message_handler.room_initial_sync( room_id=room_id, user_id=user.to_string(), ) |