From 6a7f9fe9063b651489839734b92b3f58cf5b50a2 Mon Sep 17 00:00:00 2001 From: "Vgr E.Barry" Date: Fri, 5 Jun 2015 22:58:38 -0400 Subject: [PATCH] Fix denied commands still triggering ... --- src/decorators.py | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/decorators.py b/src/decorators.py index a17e46d..ce3a033 100644 --- a/src/decorators.py +++ b/src/decorators.py @@ -119,11 +119,9 @@ class cmd: cli.notice(nick, "You are not the owner.") return - if not self.admin_only: - return self.func(*largs) - 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) if acc: @@ -141,7 +139,8 @@ class cmd: if fnmatch.fnmatch(acc.lower(), pattern.lower()): for command in self.cmds: 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) if not var.ACCOUNTS_ONLY and cloak: @@ -159,14 +158,18 @@ class cmd: if fnmatch.fnmatch(cloak.lower(), pattern.lower()): for command in self.cmds: 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) - if chan == nick: - pm(cli, nick, "You are not an admin.") - else: - cli.notice(nick, "You are not an admin.") - return + if self.admin_only: + if chan == nick: + pm(cli, nick, "You are not an admin.") + else: + cli.notice(nick, "You are not an admin.") + return + + return self.func(*largs) class hook: def __init__(self, name, hookid=-1):