Matrix/synapse
Matrix/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse synced 2024-06-30 10:13:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix async/await consentresource (#5585)

Browse source 
Fixes #5582
This commit is contained in:
Amber Brown 2019-07-01 23:33:52 +10:00 committed by GitHub
parent 04196a4dae
commit b4914681a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/5585.misc Normal file
View file

@ -0,0 +1 @@
Synapse can now handle RestServlets that return coroutines.

4
synapse/rest/consent/consent_resource.py
View file

@ -23,6 +23,8 @@ from six.moves import http_client
import jinja2
from jinja2 import TemplateNotFound
from twisted.internet import defer
from synapse.api.errors import NotFoundError, StoreError, SynapseError
from synapse.config import ConfigError
from synapse.http.server import (
@ -139,7 +141,7 @@ class ConsentResource(DirectServeResource):
else:
qualified_user_id = UserID(username, self.hs.hostname).to_string()
u = await self.store.get_user_by_id(qualified_user_id)
u = await defer.maybeDeferred(self.store.get_user_by_id, qualified_user_id)
if u is None:
raise NotFoundError("Unknown user")