diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-06-18 13:59:44 +0100 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-06-18 14:00:23 +0100 |
| commit | 0dd8953cbcfc0d62e2cf437de485693b70a85818 (patch) | |
| tree | 95ac2e755de7a442e1fb9579b129f2dc51d019e8 | |
| parent | Fix bug where synapse was sending AS user queries incorrectly. (diff) | |
| download | synapse-0dd8953cbcfc0d62e2cf437de485693b70a85818.tar.xz | |
Rename get_public_room_list() to get_published_rooms()
| -rw-r--r-- | synapse/handlers/room.py | 2 | ||||
| -rw-r--r-- | synapse/rest/client/v1/room.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 4bd027d9bb..46fe517957 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -532,7 +532,7 @@ class RoomMemberHandler(BaseHandler): class RoomListHandler(BaseHandler): @defer.inlineCallbacks - def get_public_room_list(self): + def get_published_rooms(self): chunk = yield self.store.get_rooms(is_public=True) results = yield defer.gatherResults( [ diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index 0346afb1b4..5bc88e71eb 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -273,12 +273,13 @@ class JoinRoomAliasServlet(ClientV1RestServlet): # TODO: Needs unit testing class PublicRoomListRestServlet(ClientV1RestServlet): + # TODO(paul): Can't rename this now but 'v2 ought to call this publishedRooms PATTERN = client_path_pattern("/publicRooms$") @defer.inlineCallbacks def on_GET(self, request): handler = self.handlers.room_list_handler - data = yield handler.get_public_room_list() + data = yield handler.get_published_rooms() defer.returnValue((200, data)) |