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

more clear admin command logging

Browse Source 
puts channel name first instead of in between the command and the arguments
This commit is contained in:
jacob1 2015-01-13 20:47:47 -05:00
parent 87bb3fc599
commit 0f566e3e39
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/decorators.py
View File

@ -14,7 +14,7 @@ import botconfig
import settings.wolfgame as var import settings.wolfgame as var
from tools import logger from tools import logger
adminlog = logger(None, write=False) adminlog = logger(None)
def generate(fdict, permissions=True, **kwargs): def generate(fdict, permissions=True, **kwargs):
"""Generates a decorator generator. Always use this""" """Generates a decorator generator. Always use this"""
@ -92,7 +92,7 @@ def generate(fdict, permissions=True, **kwargs):
if fnmatch.fnmatch(acc.lower(), pattern.lower()): if fnmatch.fnmatch(acc.lower(), pattern.lower()):
for cmdname in s: for cmdname in s:
if cmdname in var.ALLOW_ACCOUNTS[pattern]: if cmdname in var.ALLOW_ACCOUNTS[pattern]:
adminlog(rawnick, s[0], largs[2], largs[3]) adminlog(largs[2], rawnick, s[0], largs[3])
return f(*largs) return f(*largs)
if not var.ACCOUNTS_ONLY and cloak: if not var.ACCOUNTS_ONLY and cloak:
for pattern in var.DENY.keys(): for pattern in var.DENY.keys():
@ -105,18 +105,18 @@ def generate(fdict, permissions=True, **kwargs):
if fnmatch.fnmatch(cloak.lower(), pattern.lower()): if fnmatch.fnmatch(cloak.lower(), pattern.lower()):
for cmdname in s: for cmdname in s:
if cmdname in var.ALLOW[pattern]: if cmdname in var.ALLOW[pattern]:
adminlog(rawnick, s[0], largs[2], largs[3]) adminlog(largs[2], rawnick, s[0], largs[3])
return f(*largs) # no questions return f(*largs) # no questions
if owner_only: if owner_only:
if var.is_owner(nick): if var.is_owner(nick):
adminlog(rawnick, s[0], largs[2], largs[3]) adminlog(largs[2], rawnick, s[0], largs[3])
return f(*largs) return f(*largs)
else: else:
largs[0].notice(nick, "You are not the owner.") largs[0].notice(nick, "You are not the owner.")
return return
if admin_only: if admin_only:
if var.is_admin(nick): if var.is_admin(nick):
adminlog(rawnick, s[0], largs[2], largs[3]) adminlog(largs[2], rawnick, s[0], largs[3])
return f(*largs) return f(*largs)
else: else:
largs[0].notice(nick, "You are not an admin.") largs[0].notice(nick, "You are not an admin.")