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

Remove !ops alias for !admins

Browse Source 
There's no reasonable way to disable commands yet, and !ops is now
handled by AntiSpamMeta, so this is the best we can do for now.
This commit is contained in:
nyuszika7h 2014-11-18 20:29:33 +01:00
parent 868ef5c74e
commit 4e31c7d621
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
modules/wolfgame.py
View File

@ -5425,7 +5425,7 @@ def is_admin(cloak):
return bool([ptn for ptn in botconfig.OWNERS+botconfig.ADMINS if fnmatch.fnmatch(cloak.lower(), ptn.lower())]) return bool([ptn for ptn in botconfig.OWNERS+botconfig.ADMINS if fnmatch.fnmatch(cloak.lower(), ptn.lower())])
@cmd('admins', 'ops') @cmd("admins")
def show_admins(cli, nick, chan, rest): def show_admins(cli, nick, chan, rest):
"""Pings the admins that are available.""" """Pings the admins that are available."""
@ -5434,11 +5434,11 @@ def show_admins(cli, nick, chan, rest):
if (chan != nick and var.LAST_ADMINS and var.LAST_ADMINS + if (chan != nick and var.LAST_ADMINS and var.LAST_ADMINS +
timedelta(seconds=var.ADMINS_RATE_LIMIT) > datetime.now()): timedelta(seconds=var.ADMINS_RATE_LIMIT) > datetime.now()):
cli.notice(nick, ('This command is rate-limited. Please wait a while ' cli.notice(nick, ("This command is rate-limited. Please wait a while "
'before using it again.')) "before using it again."))
return return
if chan != nick or (var.PHASE in ('day', 'night') or nick in pl): if chan != nick or (var.PHASE in ("day", "night") or nick in pl):
var.LAST_ADMINS = datetime.now() var.LAST_ADMINS = datetime.now()
if var.ADMIN_PINGING: if var.ADMIN_PINGING:
@ -5446,27 +5446,29 @@ def show_admins(cli, nick, chan, rest):
var.ADMIN_PINGING = True var.ADMIN_PINGING = True
@hook('whoreply', hookid=4) @hook("whoreply", hookid=4)
def on_whoreply(cli, server, _, chan, __, cloak, ___, user, status, ____): def on_whoreply(cli, server, _, chan, __, cloak, ___, user, status, ____):
if not var.ADMIN_PINGING: if not var.ADMIN_PINGING:
return return
if is_admin(cloak) and 'G' not in status and user != botconfig.NICK: if is_admin(cloak) and "G" not in status and user != botconfig.NICK:
admins.append(user) admins.append(user)
@hook('endofwho', hookid=4) @hook("endofwho", hookid=4)
def show(*args): def show(*args):
if not var.ADMIN_PINGING: if not var.ADMIN_PINGING:
return return
admins.sort(key=lambda x: x.lower()) admins.sort(key=str.lower)
msg = "Available admins: " + ", ".join(admins)
if chan == nick: if chan == nick:
pm(cli, nick, 'Available admins: {}'.format(', '.join(admins))) pm(cli, nick, msg)
elif var.PHASE in ('day', 'night') and nick not in pl: elif var.PHASE in ("day", "night") and nick not in pl:
cli.notice(nick, 'Available admins: {}'.format(', '.join(admins))) cli.notice(nick, msg)
else: else:
cli.msg(chan, 'Available admins: {}'.format(', '.join(admins))) cli.msg(chan, msg)
decorators.unhook(HOOKS, 4) decorators.unhook(HOOKS, 4)
var.ADMIN_PINGING = False var.ADMIN_PINGING = False
@ -5474,12 +5476,11 @@ def show_admins(cli, nick, chan, rest):
cli.who(botconfig.CHANNEL) cli.who(botconfig.CHANNEL)
@pmcmd('admins', 'ops') @pmcmd("admins")
def show_admins_pm(cli, nick, rest): def show_admins_pm(cli, nick, rest):
show_admins(cli, nick, nick, rest) show_admins(cli, nick, nick, rest)
@cmd("coin") @cmd("coin")
def coin(cli, nick, chan, rest): def coin(cli, nick, chan, rest):
"""It's a bad idea to base any decisions on this command.""" """It's a bad idea to base any decisions on this command."""