diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-05-23 16:06:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-23 16:06:03 +0100 |
| commit | a0b3946fe2b45956336d3ddce97df6ad3e1bb2e0 (patch) | |
| tree | 06f1d9238ec9ea4033fd8298be6232c33078127a /synapse/handlers | |
| parent | Use the localpart in the consent uri (diff) | |
| parent | Merge pull request #3271 from matrix-org/rav/consent_uri_in_messages (diff) | |
| download | synapse-a0b3946fe2b45956336d3ddce97df6ad3e1bb2e0.tar.xz | |
Merge branch 'release-v0.30.0' into rav/localpart_in_consent_uri
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/message.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index 7936a60af4..c32b9bcae4 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -577,8 +577,11 @@ class EventCreationHandler(object): 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, ) |