summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2019-07-01 23:33:52 +1000
committerGitHub <noreply@github.com>2019-07-01 23:33:52 +1000
commitb4914681a5d42b9f1407c41fd2b7518b75d88ec4 (patch)
tree8ed21376f39d36313a3e85fe754a1cdcd771eb92 /synapse/rest
parentMerge pull request #5507 from matrix-org/erikj/presence_sync_tighloop (diff)
downloadsynapse-b4914681a5d42b9f1407c41fd2b7518b75d88ec4.tar.xz
fix async/await consentresource (#5585)
Fixes #5582
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/consent/consent_resource.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/rest/consent/consent_resource.py b/synapse/rest/consent/consent_resource.py
index 624c42441e..1ddf9997ff 100644
--- a/synapse/rest/consent/consent_resource.py
+++ b/synapse/rest/consent/consent_resource.py
@@ -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")