Now that HS->HS Profile lookups use Federation Queries, we don't need the 'local_only' antirecursion hack

2 files changed, 4 insertions, 10 deletions

diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py

index 950648cc12..6799132054 100644
--- a/synapse/handlers/profile.py
+++ b/synapse/handlers/profile.py
@@ -50,14 +50,14 @@ class ProfileHandler(BaseHandler):
         self.store.create_profile(user.localpart)
 
     @defer.inlineCallbacks
-    def get_displayname(self, target_user, local_only=False):
+    def get_displayname(self, target_user):
         if target_user.is_mine:
             displayname = yield self.store.get_profile_displayname(
                 target_user.localpart
             )
 
             defer.returnValue(displayname)
-        elif not local_only:
+        else:
             try:
                 result = yield self.federation.make_query(
                     destination=target_user.domain,
@@ -76,8 +76,6 @@ class ProfileHandler(BaseHandler):
                 logger.exception("Failed to get displayname")
             else:
                 defer.returnValue(result["displayname"])
-        else:
-            raise SynapseError(400, "User is not hosted on this Home Server")
 
     @defer.inlineCallbacks
     def set_displayname(self, target_user, auth_user, new_displayname):
@@ -100,14 +98,14 @@ class ProfileHandler(BaseHandler):
         )
 
     @defer.inlineCallbacks
-    def get_avatar_url(self, target_user, local_only=False):
+    def get_avatar_url(self, target_user):
         if target_user.is_mine:
             avatar_url = yield self.store.get_profile_avatar_url(
                 target_user.localpart
             )
 
             defer.returnValue(avatar_url)
-        elif not local_only:
+        else:
             try:
                 result = yield self.federation.make_query(
                     destination=target_user.domain,
@@ -125,8 +123,6 @@ class ProfileHandler(BaseHandler):
                 logger.exception("Failed to get avatar_url")
 
             defer.returnValue(result["avatar_url"])
-        else:
-            raise SynapseError(400, "User is not hosted on this Home Server")
 
     @defer.inlineCallbacks
     def set_avatar_url(self, target_user, auth_user, new_avatar_url):
diff --git a/synapse/rest/profile.py b/synapse/rest/profile.py

index 3d0427bf72..2f010c0182 100644
--- a/synapse/rest/profile.py
+++ b/synapse/rest/profile.py
@@ -30,7 +30,6 @@ class ProfileDisplaynameRestServlet(RestServlet):
 
         displayname = yield self.handlers.profile_handler.get_displayname(
             user,
-            local_only="local_only" in request.args
         )
 
         defer.returnValue((200, {"displayname": displayname}))
@@ -64,7 +63,6 @@ class ProfileAvatarURLRestServlet(RestServlet):
 
         avatar_url = yield self.handlers.profile_handler.get_avatar_url(
             user,
-            local_only="local_only" in request.args
         )
 
         defer.returnValue((200, {"avatar_url": avatar_url}))