diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-05-24 10:33:12 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-05-24 10:33:12 +0100 |
commit | 8c98281b8da9c4a8dd3d298c24fb35158682f4c1 (patch) | |
tree | dc14eca4295bac6480da9d30cb95b40917bb6674 /synapse/handlers/message.py | |
parent | Merge pull request #3268 from matrix-org/rav/privacy_policy_docs (diff) | |
parent | Merge pull request #3273 from matrix-org/rav/server_notices_avatar_url (diff) | |
download | synapse-8c98281b8da9c4a8dd3d298c24fb35158682f4c1.tar.xz |
Merge branch 'release-v0.30.0' into develop
Diffstat (limited to 'synapse/handlers/message.py')
-rw-r--r-- | synapse/handlers/message.py | 9 |
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, ) |