Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

get highlight-spam-protection setting before highlight-spam-threshold

Browse source
This commit is contained in:
jesopo 2018-08-06 14:27:49 +01:00
parent 8aa0a59e01
commit bb53f6f565
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
modules/channel_op.py
View file

@ -113,15 +113,19 @@ class Module(object):
event["target"].send_mode("-v", target)
def highlight_spam(self, event):
nicknames = list(map(lambda user: user.nickname, event["channel"].users)
) + [event["server"].nickname]
if len(set(nicknames) & set(event["message_split"])) >= event["channel"].get_setting(
if event["channel"].get_setting("highlight-spam-protection", False):
nicknames = list(map(lambda user: user.nickname,
event["channel"].users)) + [event["server"].nickname]
if len(set(nicknames) & set(event["message_split"])
) >= event["channel"].get_setting(
"highlight-spam-threshold", 10):
protection_enabled = event["channel"].get_setting("highlight-spam-protection", False)
has_mode = event["channel"].mode_or_above(event["user"], "v")
should_ban = event["channel"].get_setting("highlight-spam-ban", False)
if protection_enabled and not has_mode:
should_ban = event["channel"].get_setting("highlight-spam-ban",
False)
if not has_mode:
if should_ban:
event["channel"].send_ban("*!%s@%s" % (event["user"].username,
event["user"].hostname))
event["channel"].send_kick(event["user"].nickname, "highlight spam detected")
event["channel"].send_ban("*!%s@%s" % (
event["user"].username, event["user"].hostname))
event["channel"].send_kick(event["user"].nickname,
"highlight spam detected")