notnull/banned
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix denied commands still triggering

Browse Source 
...
This commit is contained in:
Vgr E.Barry 2015-06-05 22:58:38 -04:00
parent 6fa4910430
commit 6a7f9fe906
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/decorators.py
View File

@ -119,11 +119,9 @@ class cmd:
cli.notice(nick, "You are not the owner.") cli.notice(nick, "You are not the owner.")
return return
if not self.admin_only:
return self.func(*largs)
if var.is_admin(nick, cloak): if var.is_admin(nick, cloak):
adminlog(chan, rawnick, self.name, rest) if self.admin_only:
adminlog(chan, rawnick, self.name, rest)
return self.func(*largs) return self.func(*largs)
if acc: if acc:
@ -141,7 +139,8 @@ class cmd:
if fnmatch.fnmatch(acc.lower(), pattern.lower()): if fnmatch.fnmatch(acc.lower(), pattern.lower()):
for command in self.cmds: for command in self.cmds:
if command in var.ALLOW_ACCOUNTS[pattern]: if command in var.ALLOW_ACCOUNTS[pattern]:
adminlog(chan, rawnick, self.name, rest) if self.admin_only:
adminlog(chan, rawnick, self.name, rest)
return self.func(*largs) return self.func(*largs)
if not var.ACCOUNTS_ONLY and cloak: if not var.ACCOUNTS_ONLY and cloak:
@ -159,14 +158,18 @@ class cmd:
if fnmatch.fnmatch(cloak.lower(), pattern.lower()): if fnmatch.fnmatch(cloak.lower(), pattern.lower()):
for command in self.cmds: for command in self.cmds:
if command in var.ALLOW[pattern]: if command in var.ALLOW[pattern]:
adminlog(chan, rawnick, self.name, rest) if self.admin_only:
adminlog(chan, rawnick, self.name, rest)
return self.func(*largs) return self.func(*largs)
if chan == nick: if self.admin_only:
pm(cli, nick, "You are not an admin.") if chan == nick:
else: pm(cli, nick, "You are not an admin.")
cli.notice(nick, "You are not an admin.") else:
return cli.notice(nick, "You are not an admin.")
return
return self.func(*largs)
class hook: class hook:
def __init__(self, name, hookid=-1): def __init__(self, name, hookid=-1):