diff options
| author |  Shirayuki Nekomata <[email protected]> | 2020-09-05 23:34:47 +0700 |
|---|---|---|
| committer |  GitHub <[email protected]> | 2020-09-05 23:34:47 +0700 |
| commit | a4ab2c46c8b35e8ee9139f88a8893933dd0f8a08 (patch) | |
| tree | 2c901966503d8df6d067800067cb6576df6e6cc8 | |
| parent | Move bolding markdown outside of text link. (diff) | |
| parent | Disable everyone_ping filter in AntiSpam cog (diff) | |
Merge branch 'master' into text-link-fix
| -rw-r--r-- | bot/cogs/antispam.py | 7 | ||||
| -rw-r--r-- | config-default.yml | 18 |
2 files changed, 17 insertions, 8 deletions
diff --git a/bot/cogs/antispam.py b/bot/cogs/antispam.py index d003f962b..3ad487d8c 100644 --- a/bot/cogs/antispam.py +++ b/bot/cogs/antispam.py @@ -27,7 +27,8 @@ log = logging.getLogger(__name__) RULE_FUNCTION_MAPPING = { 'attachments': rules.apply_attachments, 'burst': rules.apply_burst, - 'burst_shared': rules.apply_burst_shared, + # burst shared is temporarily disabled due to a bug + # 'burst_shared': rules.apply_burst_shared, 'chars': rules.apply_chars, 'discord_emojis': rules.apply_discord_emojis, 'duplicates': rules.apply_duplicates, @@ -35,7 +36,9 @@ RULE_FUNCTION_MAPPING = { 'mentions': rules.apply_mentions, 'newlines': rules.apply_newlines, 'role_mentions': rules.apply_role_mentions, - 'everyone_ping': rules.apply_everyone_ping, + # the everyone filter is temporarily disabled until + # it has been improved. + # 'everyone_ping': rules.apply_everyone_ping, } diff --git a/config-default.yml b/config-default.yml index 766f7050c..6e7cff92d 100644 --- a/config-default.yml +++ b/config-default.yml @@ -352,9 +352,13 @@ anti_spam: interval: 10 max: 7 - burst_shared: - interval: 10 - max: 20 + # Burst shared it (temporarily) disabled to prevent + # the bug that triggers multiple infractions/DMs per + # user. It also tends to catch a lot of innocent users + # now that we're so big. + # burst_shared: + # interval: 10 + # max: 20 chars: interval: 5 @@ -385,9 +389,11 @@ anti_spam: interval: 10 max: 3 - everyone_ping: - interval: 10 - max: 0 + # The everyone ping filter is temporarily disabled + # until we've fixed a couple of bugs. + # everyone_ping: + # interval: 10 + # max: 0 reddit: |