diff options
| author | David Baker <dave@matrix.org> | 2015-01-28 12:51:05 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-01-28 12:51:05 +0000 |
| commit | c291a4d522afef7449311673b3863db5e484b6e8 (patch) | |
| tree | f69458797cfba50c33448a7953e34f3527158154 /synapse/rest/client/v1/admin.py | |
| parent | Reset badge count to zero when last active time is bumped (diff) | |
| parent | Initial cut of a shared base class for REST unit tests (diff) | |
| download | synapse-c291a4d522afef7449311673b3863db5e484b6e8.tar.xz | |
Merge branch 'develop' into pushers
Conflicts: synapse/handlers/events.py synapse/server.py
Diffstat (limited to 'synapse/rest/client/v1/admin.py')
| -rw-r--r-- | synapse/rest/client/v1/admin.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/synapse/rest/client/v1/admin.py b/synapse/rest/client/v1/admin.py index 0aa83514c8..1051d96f96 100644 --- a/synapse/rest/client/v1/admin.py +++ b/synapse/rest/client/v1/admin.py @@ -16,19 +16,21 @@ from twisted.internet import defer from synapse.api.errors import AuthError, SynapseError -from base import RestServlet, client_path_pattern +from synapse.types import UserID + +from base import ClientV1RestServlet, client_path_pattern import logging logger = logging.getLogger(__name__) -class WhoisRestServlet(RestServlet): +class WhoisRestServlet(ClientV1RestServlet): PATTERN = client_path_pattern("/admin/whois/(?P<user_id>[^/]*)") @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) |