diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-03-19 11:43:46 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-03-19 11:43:46 +0000 |
| commit | 45c4e19c74d8b3e05af221ffc5c81e04bd427fcc (patch) | |
| tree | 6a6e9743f1c6926690c6e070abec0dbc5efc0fa7 /synapse/handlers/message.py | |
| parent | Enforce hs_disabled_message correctly (diff) | |
| parent | fix test_auto_create_auto_join_where_no_consent (#4886) (diff) | |
| download | synapse-45c4e19c74d8b3e05af221ffc5c81e04bd427fcc.tar.xz | |
Merge remote-tracking branch 'origin/develop' into HEAD
Diffstat (limited to 'synapse/handlers/message.py')
| -rw-r--r-- | synapse/handlers/message.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index c762b58902..55787563c0 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -243,7 +243,14 @@ class EventCreationHandler(object): self.spam_checker = hs.get_spam_checker() - if self.config.block_events_without_consent_error is not None: + self._block_events_without_consent_error = ( + self.config.block_events_without_consent_error + ) + + # we need to construct a ConsentURIBuilder here, as it checks that the necessary + # config options, but *only* if we have a configuration for which we are + # going to need it. + if self._block_events_without_consent_error: self._consent_uri_builder = ConsentURIBuilder(self.config) @defer.inlineCallbacks @@ -378,7 +385,7 @@ class EventCreationHandler(object): Raises: ConsentNotGivenError: if the user has not given consent yet """ - if self.config.block_events_without_consent_error is None: + if self._block_events_without_consent_error is None: return # exempt AS users from needing consent @@ -405,7 +412,7 @@ class EventCreationHandler(object): consent_uri = self._consent_uri_builder.build_user_consent_uri( requester.user.localpart, ) - msg = self.config.block_events_without_consent_error % { + msg = self._block_events_without_consent_error % { 'consent_uri': consent_uri, } raise ConsentNotGivenError( |