ChCh/CloudBot
Archived
11
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Updated ignore to work with the new permissions system and work with *add plugins/ignore.py@* masks

Browse source
This commit is contained in:
Luke Rogers 2013-08-01 21:15:13 +12:00
parent 1a6efcdb4b
commit 94244c7c86
1 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

34
plugins/ignore.py
View file

@ -1,38 +1,48 @@
import json import json
from util import hook from util import hook
from fnmatch import fnmatch
@hook.sieve @hook.sieve
def ignoresieve(bot, input, func, type, args): def ignoresieve(bot, input, func, type, args):
""" blocks input from ignored channels/nicks/hosts """ """ blocks input from ignored channels/hosts """
ignorelist = bot.config["plugins"]["ignore"]["ignored"] ignorelist = bot.config["plugins"]["ignore"]["ignored"]
mask = input.mask.lower()
# don't block input to event hooks # don't block input to event hooks
if type == "event": if type == "event":
return input return input
if input.chan.lower() in ignorelist or\
input.nick.lower() in ignorelist or\ if ignorelist:
input.mask.lower() in ignorelist: for pattern in ignorelist:
if fnmatch(mask, pattern):
if input.command == "PRIVMSG" and input.lastparam[1:] == "unignore": if input.command == "PRIVMSG" and input.lastparam[1:] == "unignore":
return input return input
else: else:
return None return None
elif pattern.startswith("#") and pattern in ignorelist:
if input.command == "PRIVMSG" and input.lastparam[1:] == "unignore":
return input
else:
return None
return input return input
@hook.command(autohelp=False) @hook.command(autohelp=False)
def ignored(inp, notice=None, bot=None): def ignored(inp, notice=None, bot=None):
"ignored -- Lists ignored channels/nicks/hosts." "ignored -- Lists ignored channels/users."
ignorelist = bot.config["plugins"]["ignore"]["ignored"] ignorelist = bot.config["plugins"]["ignore"]["ignored"]
if ignorelist: if ignorelist:
notice("Ignored channels/nicks/hosts are: %s" % ", ".join(ignorelist)) notice("Ignored channels/users are: %s" % ", ".join(ignorelist))
else: else:
notice("No channels/nicks/hosts are currently ignored.") notice("No masks are currently ignored.")
return return
@hook.command(adminonly=True) @hook.command(permissions=["ignore"])
def ignore(inp, notice=None, bot=None, config=None): def ignore(inp, notice=None, bot=None, config=None):
"ignore <channel|nick|host> -- Makes the bot ignore <channel|nick|host>." "ignore <channel|nick|host> -- Makes the bot ignore <channel|user>."
target = inp.lower() target = inp.lower()
ignorelist = bot.config["plugins"]["ignore"]["ignored"] ignorelist = bot.config["plugins"]["ignore"]["ignored"]
if target in ignorelist: if target in ignorelist:
@ -45,10 +55,10 @@ def ignore(inp, notice=None, bot=None, config=None):
return return
@hook.command(adminonly=True) @hook.command(permissions=["ignore"])
def unignore(inp, notice=None, bot=None, config=None): def unignore(inp, notice=None, bot=None, config=None):
"unignore <channel|nick|host> -- Makes the bot listen to"\ "unignore <channel|user> -- Makes the bot listen to"\
" <channel|nick|host>." " <channel|user>."
target = inp.lower() target = inp.lower()
ignorelist = bot.config["plugins"]["ignore"]["ignored"] ignorelist = bot.config["plugins"]["ignore"]["ignored"]
if target in ignorelist: if target in ignorelist: