diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-08-13 18:03:37 +0100 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-08-13 18:03:41 +0100 |
| commit | 3a1cfe18cf07d463446f4fc9bed890a8a6100826 (patch) | |
| tree | b1e5c23e3a4a2bd6c8a427f4d46cad50ab268806 /synapse/rest | |
| parent | Add a HomeServer.parse_roomalias() to avoid having to RoomAlias.from_sring(..... (diff) | |
| download | synapse-3a1cfe18cf07d463446f4fc9bed890a8a6100826.tar.xz | |
Implement directory service federation by Federation Queries; avoid local_only hack; add unit tests
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/directory.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/synapse/rest/directory.py b/synapse/rest/directory.py index 362f76c6ca..be9a3f5f9f 100644 --- a/synapse/rest/directory.py +++ b/synapse/rest/directory.py @@ -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)) |