diff options
| author | David Baker <dave@matrix.org> | 2018-05-24 16:20:53 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2018-05-24 16:20:53 +0100 |
| commit | 77a23e2e058bbc02a675bd6e14bff2c9906c68b2 (patch) | |
| tree | 5b65ad8562dc2d584b35b47999b5e004ad21b387 /synapse/handlers/message.py | |
| parent | pep8 (diff) | |
| parent | Merge pull request #3277 from matrix-org/dbkr/remove_from_user_dir (diff) | |
| download | synapse-77a23e2e058bbc02a675bd6e14bff2c9906c68b2.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/unbind
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, ) |