summary refs log tree commit diff
path: root/synapse/rest/room.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-26 16:29:44 +0100
committerErik Johnston <erik@matrix.org>2014-08-26 16:29:44 +0100
commit8885c8546c3493ada2f00b1626d45fa90109ab5f (patch)
tree7dbe04a84413a4511bcc3ef62d227659052cefa7 /synapse/rest/room.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into stream_refactor (diff)
parentRespect 'limit' param in initialSync api (diff)
downloadsynapse-8885c8546c3493ada2f00b1626d45fa90109ab5f.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Diffstat (limited to 'synapse/rest/room.py')
-rw-r--r--synapse/rest/room.py4
1 files changed, 2 insertions, 2 deletions
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):