diff options
author | Kegan Dougal <kegan@matrix.org> | 2014-08-26 16:19:44 +0100 |
---|---|---|
committer | Kegan Dougal <kegan@matrix.org> | 2014-08-26 16:19:44 +0100 |
commit | d0103400b556138fca36160fd0273c0141ca94c4 (patch) | |
tree | 0a66e58777d171743b72cf0e93240f747c6a5825 /synapse/rest/room.py | |
parent | Use state_key rather than target_user_id (diff) | |
parent | Renaming: /im/sync >> /initialSync. /rooms/$roomid/members/list >> /rooms/$ro... (diff) | |
download | synapse-d0103400b556138fca36160fd0273c0141ca94c4.tar.xz |
Merge branch 'client_server_url_rename' into develop
Diffstat (limited to 'synapse/rest/room.py')
-rw-r--r-- | synapse/rest/room.py | 4 |
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): |