summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-05-23 16:29:44 +0100
committerGitHub <noreply@github.com>2018-05-23 16:29:44 +0100
commit23aa70cea800b28d7bee8cfd77cbbd4e10eeb10f (patch)
tree205889d0493c12844200a549949bf9e2113db7b7
parentMerge docs on consent bits from PR #3268 into release branch (diff)
parentMerge branch 'release-v0.30.0' into rav/localpart_in_consent_uri (diff)
downloadsynapse-23aa70cea800b28d7bee8cfd77cbbd4e10eeb10f.tar.xz
Merge pull request #3272 from matrix-org/rav/localpart_in_consent_uri
Use the localpart in the consent uri
-rw-r--r--synapse/handlers/message.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 0886607023..c32b9bcae4 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -574,7 +574,9 @@ 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,
         }