diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2015-01-23 13:41:55 +0000 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2015-01-23 13:41:55 +0000 |
| commit | f7cb6042117fd54748ec771337a4b04fe8498ac8 (patch) | |
| tree | 62fece1cc473923d5bd4e72dac9035ca9e81ea1f /synapse/rest/client/v1/admin.py | |
| parent | Merge pull request #31 from matrix-org/client_api_resource (diff) | |
| parent | Remove hs.parse_eventid (diff) | |
| download | synapse-f7cb6042117fd54748ec771337a4b04fe8498ac8.tar.xz | |
Merge pull request #32 from matrix-org/remove_parse_id_from_hs
Remove parse id from hs
Diffstat (limited to '')
| -rw-r--r-- | synapse/rest/client/v1/admin.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/admin.py b/synapse/rest/client/v1/admin.py index 0aa83514c8..4aefb94053 100644 --- a/synapse/rest/client/v1/admin.py +++ b/synapse/rest/client/v1/admin.py @@ -16,6 +16,8 @@ from twisted.internet import defer from synapse.api.errors import AuthError, SynapseError +from synapse.types import UserID + from base import RestServlet, client_path_pattern import logging @@ -28,7 +30,7 @@ class WhoisRestServlet(RestServlet): @defer.inlineCallbacks def on_GET(self, request, user_id): - target_user = self.hs.parse_userid(user_id) + target_user = UserID.from_string(user_id) auth_user = yield self.auth.get_user_by_req(request) is_admin = yield self.auth.is_server_admin(auth_user) |