From cba592531bface08212c4d5ca4aeb8a7d4665640 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Fri, 28 Jun 2019 13:04:13 -0400 Subject: [PATCH] target --- sopel_modules/SpiceBot/DictComs.py | 4 ++-- sopel_modules/SpiceBot_Core_Commands/DictComs.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sopel_modules/SpiceBot/DictComs.py b/sopel_modules/SpiceBot/DictComs.py index 6a3b8aa..6573562 100644 --- a/sopel_modules/SpiceBot/DictComs.py +++ b/sopel_modules/SpiceBot/DictComs.py @@ -26,7 +26,7 @@ class BotDictCommands(): def __init__(self): self.setup_dictcoms() self.valid_com_types = [ - 'simple', 'fillintheblank', 'targetintheblank', 'targetplusreason', + 'simple', 'fillintheblank', 'target', 'targetplusreason', 'sayings', "readfromfile", "readfromurl", "ascii_art", "gif", "translate", "responses", "feeds", "search" @@ -134,7 +134,7 @@ class BotDictCommands(): # each usecase needs to know if it needs a target if "target_required" not in list(dict_from_file[mustbe].keys()): - if dict_from_file[mustbe]["type"] in ['targetintheblank', 'targetplusreason']: + if dict_from_file[mustbe]["type"] in ['target', 'targetplusreason']: dict_from_file[mustbe]["target_required"] = True else: dict_from_file[mustbe]["target_required"] = False diff --git a/sopel_modules/SpiceBot_Core_Commands/DictComs.py b/sopel_modules/SpiceBot_Core_Commands/DictComs.py index 33dbedf..0516897 100644 --- a/sopel_modules/SpiceBot_Core_Commands/DictComs.py +++ b/sopel_modules/SpiceBot_Core_Commands/DictComs.py @@ -142,7 +142,7 @@ def bot_dictcom_process(bot, trigger): trigger.sb["target"] = False trigger.sb["success"] = True - if trigger.sb["dict"][trigger.sb["responsekey"]]["type"] in ['simple', 'fillintheblank', "targetintheblank", 'targetplusreason', 'sayings', "readfromfile", "readfromurl", "ascii_art", "translate", "responses"]: + if trigger.sb["dict"][trigger.sb["responsekey"]]["type"] in ['simple', 'fillintheblank', "target", 'targetplusreason', 'sayings', "readfromfile", "readfromurl", "ascii_art", "translate", "responses"]: return bot_dictcom_responses(bot, trigger) else: command_function_run = str('bot_dictcom_' + trigger.sb["dict"][trigger.sb["responsekey"]]["type"] + '(bot, botcom)')