From 9459137f1ed18ebd0e2a1ff728868dafcd9c9c1a Mon Sep 17 00:00:00 2001
From: "Paul \"LeoNerd\" Evans" <paul@matrix.org>
Date: Thu, 25 Aug 2016 18:35:38 +0100
Subject: [PATCH] Just sprintf the 'kind' argument into uri directly

---
 synapse/appservice/api.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/synapse/appservice/api.py b/synapse/appservice/api.py
index 24253e7785..775417eb21 100644
--- a/synapse/appservice/api.py
+++ b/synapse/appservice/api.py
@@ -106,10 +106,8 @@ class ApplicationServiceApi(SimpleHttpClient):
     @defer.inlineCallbacks
     def query_3pe(self, service, kind, protocol, fields):
         if kind == ThirdPartyEntityKind.USER:
-            fragment = "user"
             required_field = "userid"
         elif kind == ThirdPartyEntityKind.LOCATION:
-            fragment = "location"
             required_field = "alias"
         else:
             raise ValueError(
@@ -119,7 +117,7 @@ class ApplicationServiceApi(SimpleHttpClient):
         uri = "%s%s/thirdparty/%s/%s" % (
             service.url,
             APP_SERVICE_PREFIX,
-            fragment,
+            kind,
             urllib.quote(protocol)
         )
         try: