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

lots of nonworking code

Browse source
This commit is contained in:
Luke Rogers 2013-10-13 17:32:08 +13:00
parent ed2eefb9cd
commit d330df5711
9 changed files with 75 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/core_sieve.py
View file

@ -12,16 +12,16 @@ def sieve_suite(bot, input, func, kind, args):
return None
if kind == "command":
disabled_commands = conn.conf.get('disabled_plugins', [])
disabled_commands = conn.config.get('disabled_plugins', [])
if input.trigger in disabled_commands:
return None
fn = re.match(r'^plugins.(.+).py$', func._filename)
disabled = conn.conf.get('disabled_plugins', [])
disabled = conn.config.get('disabled_plugins', [])
if fn and fn.group(1).lower() in disabled:
return None
acl = conn.conf.get('acls', {}).get(func.__name__)
acl = conn.config.get('acls', {}).get(func.__name__)
if acl:
if 'deny-except' in acl:
allowed_channels = map(unicode.lower, acl['deny-except'])
@ -37,7 +37,7 @@ def sieve_suite(bot, input, func, kind, args):
args["permissions"] = ["adminonly"]
if args.get('permissions', False):
groups = conn.conf.get("permissions", [])
groups = conn.config.get("permissions", [])
allowed_permissions = args.get('permissions', [])
allowed_groups = []
@ -58,7 +58,7 @@ def sieve_suite(bot, input, func, kind, args):
mask = input.mask.lower()
for group in allowed_groups:
group_users = conn.conf.get("permissions", {}).get(group, [])["users"]
group_users = conn.conig.get("permissions", {}).get(group, [])["users"]
group_users = [_mask.lower() for _mask in group_users]
for pattern in group_users:
if fnmatch(mask, pattern):