diff options
| author | Erik Johnston <erik@matrix.org> | 2019-12-06 11:28:44 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-12-06 11:33:34 +0000 |
| commit | 2ace775d88391181365c3c6b1be5c231127edf7f (patch) | |
| tree | c74f635c4241533ed5cb9f921b3edd4ce397a0b5 /synapse/rest/client/v1/voip.py | |
| parent | Remove unused var (diff) | |
| parent | Replace /admin/v1/users_paginate endpoint with /admin/v2/users (#5925) (diff) | |
| download | synapse-2ace775d88391181365c3c6b1be5c231127edf7f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/make_database_class
Diffstat (limited to 'synapse/rest/client/v1/voip.py')
| -rw-r--r-- | synapse/rest/client/v1/voip.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/synapse/rest/client/v1/voip.py b/synapse/rest/client/v1/voip.py index 2afdbb89e5..747d46eac2 100644 --- a/synapse/rest/client/v1/voip.py +++ b/synapse/rest/client/v1/voip.py @@ -17,8 +17,6 @@ import base64 import hashlib import hmac -from twisted.internet import defer - from synapse.http.servlet import RestServlet from synapse.rest.client.v2_alpha._base import client_patterns @@ -31,9 +29,8 @@ class VoipRestServlet(RestServlet): self.hs = hs self.auth = hs.get_auth() - @defer.inlineCallbacks - def on_GET(self, request): - requester = yield self.auth.get_user_by_req( + async def on_GET(self, request): + requester = await self.auth.get_user_by_req( request, self.hs.config.turn_allow_guests ) |