Implement directory service federation by Federation Queries; avoid local_only hack; add unit tests

This commit is contained in:
Paul "LeoNerd" Evans 2014-08-13 18:03:37 +01:00
parent 7fb93f2a47
commit 3a1cfe18cf
3 changed files with 141 additions and 27 deletions

View file

@ -35,16 +35,10 @@ class ClientDirectoryServer(RestServlet):
@defer.inlineCallbacks
def on_GET(self, request, room_alias):
# TODO(erikj): Handle request
local_only = "local_only" in request.args
room_alias = self.hs.parse_roomalias(urllib.unquote(room_alias))
dir_handler = self.handlers.directory_handler
res = yield dir_handler.get_association(
room_alias,
local_only=local_only
)
res = yield dir_handler.get_association(room_alias)
defer.returnValue((200, res))