diff --git a/sopel_modules/SpiceBot/Prerun.py b/sopel_modules/SpiceBot/Prerun.py index 913011b..288ae78 100644 --- a/sopel_modules/SpiceBot/Prerun.py +++ b/sopel_modules/SpiceBot/Prerun.py @@ -23,7 +23,32 @@ from .Users import users as botusers from .Events import events as botevents -# TODO check identify for OPs and bot admins +class Botprerun_shared(): + def __init__(self): + + self.valid_hyphen_args = [ + 'check', 'view', + 'count', + 'enable', 'disable', + 'block', 'unblock', + "activate", "deactivate", + "on", "off", + 'multirun', 'multiruns', + 'example', 'usage', + 'filename', 'filepath', + 'foldername', 'folderpath', + "author", + 'contribs', 'contrib', "contributors", + 'alias', 'aliases', + 'random' + ] + + self.numdict = { + "last": -1 + } + + +prerun_shared = Botprerun_shared() def prerun(t_command_type='module', t_command_subtype=None): @@ -436,25 +461,6 @@ def trigger_cant_run(bot, trigger, botcom, message=None): def trigger_hyphen_args(trigger_args_part): - valid_hyphen_args = [ - 'check', 'view', - 'count', - 'enable', 'disable', - 'block', 'unblock', - "activate", "deactivate", - "on", "off", - 'multirun', 'multiruns', - 'example', 'usage', - 'filename', 'filepath', - 'foldername', 'folderpath', - "author", - 'contribs', 'contrib', "contributors", - 'alias', 'aliases', - 'random' - ] - numdict = { - "last": -1 - } hyphen_args = [] trigger_args_unhyphend = [] @@ -463,14 +469,14 @@ def trigger_hyphen_args(trigger_args_part): clipped_word = str(worditem[2:]).lower() # valid arg above - if clipped_word in valid_hyphen_args: + if clipped_word in prerun_shared.valid_hyphen_args: hyphen_args.append(clipped_word) # numbered args elif str(clipped_word).isdigit(): hyphen_args.append(int(clipped_word)) - elif clipped_word in list(numdict.keys()): - hyphen_args.append(int(numdict[clipped_word])) + elif clipped_word in list(prerun_shared.numdict.keys()): + hyphen_args.append(int(prerun_shared.numdict[clipped_word])) else: diff --git a/sopel_modules/SpiceBot_Core_Commands/DictComs.py b/sopel_modules/SpiceBot_Core_Commands/DictComs.py index dff2948..68f8253 100644 --- a/sopel_modules/SpiceBot_Core_Commands/DictComs.py +++ b/sopel_modules/SpiceBot_Core_Commands/DictComs.py @@ -82,9 +82,6 @@ def bot_dictcom_process(bot, trigger, botcom): nonstockoptions = spicemanip(botcom.dict["nonstockoptions"], "andlist") return bot.osd("The special options for " + str(botcom.dict["realcom"]) + " command include: " + str(nonstockoptions) + ".") - elif botcom.dict["specified"] == 'count': - return bot.osd("The " + str(botcom.dict["realcom"]) + " " + str(botcom.dict["responsekey"] or '') + " command has " + str(len(botcom.dict["dict"][botcom.dict["responsekey"]]["responses"])) + " entries.") - elif botcom.dict["specified"] == 'add': if not botcom.dict["dict"][botcom.dict["responsekey"]]["updates_enabled"]: