Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-18 00:44:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Allow error strings from spam checker

Browse Source
This commit is contained in:
David Baker 2017-10-11 14:39:22 +01:00
parent c2c47550f9
commit c3b7a45e84
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
synapse/handlers/message.py
View File

@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright 2014 - 2016 OpenMarket Ltd
# Copyright 2017 New Vector Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -325,9 +326,12 @@ class MessageHandler(BaseHandler):
txn_id=txn_id
)
if self.spam_checker.check_event_for_spam(event):
spam_error = self.spam_checker.check_event_for_spam(event)
if spam_error:
if not isinstance(spam_error, (str, basestring)):
spam_error = "Spam is not permitted here"
raise SynapseError(
403, "Spam is not permitted here", Codes.FORBIDDEN
403, spam_error, Codes.FORBIDDEN
)
yield self.send_nonmember_event(