Merge branch 'release-v0.30.0' into rav/localpart_in_consent_uri

This commit is contained in:
Richard van der Hoff 2018-05-23 16:06:03 +01:00 committed by GitHub
commit a0b3946fe2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 55 additions and 8 deletions

View file

@ -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,
)