diff --git a/sopel_modules/SpiceBot/DictComs.py b/sopel_modules/SpiceBot/DictComs.py index 78fe249..faa4f0d 100644 --- a/sopel_modules/SpiceBot/DictComs.py +++ b/sopel_modules/SpiceBot/DictComs.py @@ -25,7 +25,6 @@ class BotDictCommands(): def __init__(self): self.setup_dictcoms() - self.validprefixcoms = [] self.header = {'User-Agent': str(UserAgent().chrome)} self.valid_com_types = [ 'simple', 'fillintheblank', 'targetplusreason', @@ -66,7 +65,7 @@ class BotDictCommands(): if "type" not in list(dict_from_file.keys()) or dict_from_file["type"] not in self.valid_com_types: dict_from_file["type"] = 'simple' - dict_from_file["comtype"] = "prefix_" + dict_from_file["type"] + dict_from_file["comtype"] = "prefix" + dict_from_file["type"] # Don't process these. keysprocessed = [] @@ -93,10 +92,6 @@ class BotDictCommands(): botcommands.register(dict_from_file) - for commandtype in self.valid_com_types: - if "prefix_" + commandtype in list(botcommands.dict['commands'].keys()): - self.validprefixcoms.extend(list(botcommands.dict['commands']["prefix_" + commandtype].keys())) - def bot_dict_use_cases(self, maincom, dict_from_file, process_list): for mustbe in process_list: diff --git a/sopel_modules/SpiceBot_Core_Commands/DictComs.py b/sopel_modules/SpiceBot_Core_Commands/DictComs.py index 69b86be..0cb2753 100644 --- a/sopel_modules/SpiceBot_Core_Commands/DictComs.py +++ b/sopel_modules/SpiceBot_Core_Commands/DictComs.py @@ -14,7 +14,11 @@ import sopel_modules.SpiceBot as SpiceBot @sopel.module.commands('(.*)') def command_dictcom(bot, trigger): - if trigger.sb['com'] not in list(SpiceBot.dictcoms.validprefixcoms): + if trigger.sb['com'] not in list(SpiceBot.commands.dict['commands']["prefix"].keys()): return - bot.say("here") + # command aliases + if "aliasfor" in list(SpiceBot.commands.dict['commands']["prefix"][trigger.sb['com']].keys()): + trigger.sb['com'] = SpiceBot.commands.dict['commands']["prefix"][trigger.sb['com']]["aliasfor"] + + bot.say(str(trigger.sb['com']))