From 3a1cfe18cf07d463446f4fc9bed890a8a6100826 Mon Sep 17 00:00:00 2001
From: "Paul \"LeoNerd\" Evans" <paul@matrix.org>
Date: Wed, 13 Aug 2014 18:03:37 +0100
Subject: Implement directory service federation by Federation Queries; avoid
 local_only hack; add unit tests

---
 synapse/rest/directory.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'synapse/rest')

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))
 
-- 
cgit 1.5.1