Merge pull request #3272 from matrix-org/rav/localpart_in_consent_uri

Use the localpart in the consent uri

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,
         }