From 53186abdabdb2d3960e32490be2924c31e5915b0 Mon Sep 17 00:00:00 2001 From: jcao219 Date: Sat, 14 Jul 2012 21:34:11 -0500 Subject: [PATCH] allow the enabling of certain debug mode commands in normal mode via config --- botconfig.py.example | 2 ++ modules/common.py | 35 -------------------------------- modules/wolfgame.py | 48 +++++++++++++++----------------------------- 3 files changed, 18 insertions(+), 67 deletions(-) diff --git a/botconfig.py.example b/botconfig.py.example index 8522e6c..6b6b0cd 100644 --- a/botconfig.py.example +++ b/botconfig.py.example @@ -14,6 +14,8 @@ IGNORE_HIDDEN_COMMANDS = True # Ignore commands sent to @#channel or +#channel ALLOW_NOTICE_COMMANDS = False # allow /notice #channel !command to be interpreted as a command ALLOW_PRIVATE_NOTICE_COMMANDS = False # allow !command's from /notice (Private) +ALLOWED_NORMAL_MODE_COMMANDS = [] + OWNERS = ("unaffiliated/wolfbot_admin1",) # the comma is required at the end if there is one owner ADMINS = ("unaffiliated/wolfbot_admin2", "unaffiliated/wolfbot_admin3") # glob syntax supported (wildcards) ALLOW = {"cloakof/fwaiter": ("fwait",), diff --git a/modules/common.py b/modules/common.py index 14381d3..fdc825f 100644 --- a/modules/common.py +++ b/modules/common.py @@ -163,41 +163,6 @@ def connect_callback(cli): def on_ping(cli, prefix, server): cli.send('PONG', server) -@cmd("frehash", admin_only = True) -def reload_modules(cli, nick, chan, rest): - error = False - - try: - imp.reload(var) - imp.reload(botconfig) - imp.reload(decorators.botconfig) - except SyntaxError as e: - logging.error(traceback.format_exc()) - cli.msg(chan, "Syntax error.") - error = True - - for nam, mod in ld.MODULES.items(): - if nam == ld.CURRENT_MODULE: - try: - mod.quit_callback(cli) - except AttributeError: - pass # no quit_callback - print("Reloading module {0}....".format(nam)) - try: - imp.reload(mod) - imp.reload(mod.var) - imp.reload(mod.botconfig) - imp.reload(mod.decorators.botconfig) - except AttributeError: - pass - except SyntaxError as e: - logging.error(traceback.format_exc()) - cli.msg(chan, "Syntax error in module {0}".format(nam)) - error = True - - if not error: - cli.msg(chan, "Operation successful.") - if botconfig.DEBUG_MODE: diff --git a/modules/wolfgame.py b/modules/wolfgame.py index 230ed78..a02f8c6 100644 --- a/modules/wolfgame.py +++ b/modules/wolfgame.py @@ -104,7 +104,7 @@ def connect_callback(cli): # devoice all on connect @hook("mode", hookid=294) - def on_give_me_ops(cli, blah, blahh, modeaction, target=""): + def on_give_me_ops(cli, blah, blahh, modeaction, target="", *other): if modeaction == "+o" and target == botconfig.NICK and var.PHASE == "none": @hook("quietlistend", 294) @@ -121,14 +121,6 @@ def connect_callback(cli): cli.who(botconfig.CHANNEL, "%nuhaf") - -def quit_callback(cli): - # clean up - if var.PHASE in ("day", "night"): - stop_game(cli) - else: - reset(cli) - def mass_mode(cli, md): @@ -224,28 +216,6 @@ def restart_program(cli, nick, *rest): os.execl(python, python, sys.argv[0], "--verbose") else: os.execl(python, python, *sys.argv) - - - - -# @cmd("frehash", admin_only=True) -# def frehash(cli, nick, chan, rest): - # if var.PHASE in ("day", "night"): - # stop_game(cli) - # else: - # reset(cli) - # imp.reload(botconfig) - # imp.reload(var) - # imp.reload(decorators.botconfig) - - # if botconfig.DEBUG_MODE: - # var.NIGHT_TIME_LIMIT = 0 # 90 - # var.DAY_TIME_LIMIT_WARN = 0 - # var.DAY_TIME_LIMIT_CHANGE = 0 - # var.KILL_IDLE_TIME = 0 #300 - # var.WARN_IDLE_TIME = 0 #180 - - # cli.msg(chan, "Operation successful.") @@ -2689,10 +2659,13 @@ def flastgame(cli, nick, rest): def _flastgame(cli, nick, chan, rest): flastgame(cli, nick, rest) +before_debug_mode_commands = list(COMMANDS.keys()) +before_debug_mode_pmcommands = list(PM_COMMANDS.keys()) -if botconfig.DEBUG_MODE: +if botconfig.DEBUG_MODE or botconfig.ALLOWED_NORMAL_MODE_COMMANDS: @cmd("eval", owner_only = True) + @pmcmd("exec", owner_only = True) def pyeval(cli, nick, chan, rest): try: a = str(eval(rest)) @@ -2706,6 +2679,7 @@ if botconfig.DEBUG_MODE: @cmd("exec", owner_only = True) + @pmcmd("exec", owner_only = True) def py(cli, nick, chan, rest): try: exec(rest) @@ -2913,3 +2887,13 @@ if botconfig.DEBUG_MODE: cli.msg(chan, "Operation successful.") if var.PHASE not in ('none','join'): chk_win(cli) + +if botconfig.ALLOWED_NORMAL_MODE_COMMANDS: + for comd in list(COMMANDS.keys()): + if (comd not in before_debug_mode_commands and + comd not in botconfig.ALLOWED_NORMAL_MODE_COMMANDS): + del COMMANDS[comd] + for pmcomd in list(PM_COMMANDS.keys()): + if (pmcomd not in before_debug_mode_pmcommands and + pmcomd not in botconfig.ALLOWED_NORMAL_MODE_COMMANDS): + del PM_COMMANDS[pmcomd] \ No newline at end of file