summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-05-24 10:33:12 +0100
committerRichard van der Hoff <richard@matrix.org>2018-05-24 10:33:12 +0100
commit8c98281b8da9c4a8dd3d298c24fb35158682f4c1 (patch)
treedc14eca4295bac6480da9d30cb95b40917bb6674 /synapse/handlers
parentMerge pull request #3268 from matrix-org/rav/privacy_policy_docs (diff)
parentMerge pull request #3273 from matrix-org/rav/server_notices_avatar_url (diff)
downloadsynapse-8c98281b8da9c4a8dd3d298c24fb35158682f4c1.tar.xz
Merge branch 'release-v0.30.0' into develop
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/message.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index c3adbc6c95..c32b9bcae4 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -574,9 +574,14 @@ class EventCreationHandler(object):
         if u["consent_version"] == self.config.user_consent_version:
             return
 
-        consent_uri = self._consent_uri_builder.build_user_consent_uri(user_id)
+        consent_uri = self._consent_uri_builder.build_user_consent_uri(
+            requester.user.localpart,
+        )
+        msg = self.config.block_events_without_consent_error % {
+            'consent_uri': consent_uri,
+        }
         raise ConsentNotGivenError(
-            msg=self.config.block_events_without_consent_error,
+            msg=msg,
             consent_uri=consent_uri,
         )