diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-08-26 16:20:50 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-08-26 16:20:50 +0100 |
| commit | 66a4d3352447f170afcddd1270c1a743273d19e6 (patch) | |
| tree | 49ee0260dd816d6f7c640f742c4895c6b5cb10fb /synapse | |
| parent | Merge branch 'develop' into storage_transactions (diff) | |
| parent | Merge branch 'client_server_url_rename' into develop (diff) | |
| download | synapse-66a4d3352447f170afcddd1270c1a743273d19e6.tar.xz | |
Merge branch 'develop' into storage_transactions
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/rest/__init__.py | 5 | ||||
| -rw-r--r-- | synapse/rest/initial_sync.py (renamed from synapse/rest/im.py) | 6 | ||||
| -rw-r--r-- | synapse/rest/room.py | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py index da18933b63..47896612ce 100644 --- a/synapse/rest/__init__.py +++ b/synapse/rest/__init__.py @@ -15,7 +15,8 @@ from . import ( - room, events, register, login, profile, public, presence, im, directory + room, events, register, login, profile, public, presence, initial_sync, + directory ) @@ -41,5 +42,5 @@ class RestServletFactory(object): profile.register_servlets(hs, client_resource) public.register_servlets(hs, client_resource) presence.register_servlets(hs, client_resource) - im.register_servlets(hs, client_resource) + initial_sync.register_servlets(hs, client_resource) directory.register_servlets(hs, client_resource) diff --git a/synapse/rest/im.py b/synapse/rest/initial_sync.py index 63a77716a0..fab748f562 100644 --- a/synapse/rest/im.py +++ b/synapse/rest/initial_sync.py @@ -19,8 +19,8 @@ from synapse.api.streams import PaginationConfig from base import RestServlet, client_path_pattern -class ImSyncRestServlet(RestServlet): - PATTERN = client_path_pattern("/im/sync$") +class InitialSyncRestServlet(RestServlet): + PATTERN = client_path_pattern("/initialSync$") @defer.inlineCallbacks def on_GET(self, request): @@ -37,4 +37,4 @@ class ImSyncRestServlet(RestServlet): def register_servlets(hs, http_server): - ImSyncRestServlet(hs).register(http_server) + InitialSyncRestServlet(hs).register(http_server) diff --git a/synapse/rest/room.py b/synapse/rest/room.py index 6771da8fcd..b031ad1bc4 100644 --- a/synapse/rest/room.py +++ b/synapse/rest/room.py @@ -306,7 +306,7 @@ class FeedbackRestServlet(RestServlet): class RoomMemberListRestServlet(RestServlet): - PATTERN = client_path_pattern("/rooms/(?P<room_id>[^/]*)/members/list$") + PATTERN = client_path_pattern("/rooms/(?P<room_id>[^/]*)/members$") @defer.inlineCallbacks def on_GET(self, request, room_id): @@ -333,7 +333,7 @@ class RoomMemberListRestServlet(RestServlet): class RoomMessageListRestServlet(RestServlet): - PATTERN = client_path_pattern("/rooms/(?P<room_id>[^/]*)/messages/list$") + PATTERN = client_path_pattern("/rooms/(?P<room_id>[^/]*)/messages$") @defer.inlineCallbacks def on_GET(self, request, room_id): |