Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Just sprintf the 'kind' argument into uri directly

This commit is contained in:
Paul "LeoNerd" Evans 2016-08-25 18:35:38 +01:00
parent 1294d4a329
commit 9459137f1e
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/appservice/api.py
View File

@ -106,10 +106,8 @@ class ApplicationServiceApi(SimpleHttpClient):
@defer.inlineCallbacks @defer.inlineCallbacks
def query_3pe(self, service, kind, protocol, fields): def query_3pe(self, service, kind, protocol, fields):
if kind == ThirdPartyEntityKind.USER: if kind == ThirdPartyEntityKind.USER:
fragment = "user"
required_field = "userid" required_field = "userid"
elif kind == ThirdPartyEntityKind.LOCATION: elif kind == ThirdPartyEntityKind.LOCATION:
fragment = "location"
required_field = "alias" required_field = "alias"
else: else:
raise ValueError( raise ValueError(
@ -119,7 +117,7 @@ class ApplicationServiceApi(SimpleHttpClient):
uri = "%s%s/thirdparty/%s/%s" % ( uri = "%s%s/thirdparty/%s/%s" % (
service.url, service.url,
APP_SERVICE_PREFIX, APP_SERVICE_PREFIX,
fragment, kind,
urllib.quote(protocol) urllib.quote(protocol)
) )
try: try: