summary refs log tree commit diff
path: root/synapse/handlers/profile.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-23 15:51:48 +0000
committerErik Johnston <erik@matrix.org>2015-01-23 15:51:48 +0000
commit9b1e552b5163aad84a3ae4fd70116d3e782fb443 (patch)
tree19d827838d10688da26e3fa5503c63b71fd34db0 /synapse/handlers/profile.py
parentAdd storage method have_events (diff)
parentUpdate .gitignore (diff)
downloadsynapse-9b1e552b5163aad84a3ae4fd70116d3e782fb443.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
Diffstat (limited to 'synapse/handlers/profile.py')
-rw-r--r--synapse/handlers/profile.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py
index 7777d3cc94..03b2159c53 100644
--- a/synapse/handlers/profile.py
+++ b/synapse/handlers/profile.py
@@ -18,6 +18,7 @@ from twisted.internet import defer
 from synapse.api.errors import SynapseError, AuthError, CodeMessageException
 from synapse.api.constants import EventTypes, Membership
 from synapse.util.logcontext import PreserveLoggingContext
+from synapse.types import UserID
 
 from ._base import BaseHandler
 
@@ -169,7 +170,7 @@ class ProfileHandler(BaseHandler):
 
     @defer.inlineCallbacks
     def on_profile_query(self, args):
-        user = self.hs.parse_userid(args["user_id"])
+        user = UserID.from_string(args["user_id"])
         if not self.hs.is_mine(user):
             raise SynapseError(400, "User is not hosted on this Home Server")