diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-05-23 16:04:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-23 16:04:30 +0100 |
| commit | 2f7008d4eb63043147d1525ad57cf5a4578dcc3b (patch) | |
| tree | e8d8b097aa8f180dfc3671a4781d39aa8ab88be4 /synapse/handlers | |
| parent | fix typo (diff) | |
| parent | Support for putting %(consent_uri)s in messages (diff) | |
| download | synapse-2f7008d4eb63043147d1525ad57cf5a4578dcc3b.tar.xz | |
Merge pull request #3271 from matrix-org/rav/consent_uri_in_messages
Support for putting %(consent_uri)s in messages
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 c3adbc6c95..0886607023 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -575,8 +575,11 @@ class EventCreationHandler(object): return consent_uri = self._consent_uri_builder.build_user_consent_uri(user_id) + 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, ) |