summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-26 16:19:44 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-26 16:19:44 +0100
commitd0103400b556138fca36160fd0273c0141ca94c4 (patch)
tree0a66e58777d171743b72cf0e93240f747c6a5825 /synapse
parentUse state_key rather than target_user_id (diff)
parentRenaming: /im/sync >> /initialSync. /rooms/$roomid/members/list >> /rooms/$ro... (diff)
downloadsynapse-d0103400b556138fca36160fd0273c0141ca94c4.tar.xz
Merge branch 'client_server_url_rename' into develop
Diffstat (limited to 'synapse')
-rw-r--r--synapse/rest/__init__.py5
-rw-r--r--synapse/rest/initial_sync.py (renamed from synapse/rest/im.py)6
-rw-r--r--synapse/rest/room.py4
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):