From 51847e7ebb00c536875b8b25b1d1781e25e5d955 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Fri, 20 Sep 2019 15:53:52 -0400 Subject: [PATCH] test --- sopel_modules/SpiceBot_Core_Commands/AI.py | 9 ++++----- sopel_modules/SpiceBot_Core_Commands/DictComs.py | 2 +- sopel_modules/SpiceBot_Core_Tools/Search.py | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/sopel_modules/SpiceBot_Core_Commands/AI.py b/sopel_modules/SpiceBot_Core_Commands/AI.py index 1e7b928..3ba0e6a 100644 --- a/sopel_modules/SpiceBot_Core_Commands/AI.py +++ b/sopel_modules/SpiceBot_Core_Commands/AI.py @@ -186,12 +186,11 @@ def bot_command_rule_ai(bot, trigger): } searchreturn = SpiceBot.search.search(searchdict) if not searchreturn: - bot.osd('I cannot find anything about that') + searchreturn = 'I cannot find anything about that' + if trigger_args[0].lower() == "where": + bot.osd(["[Location search for " + str(searchterm) + "]", str(searchreturn)]) else: - if trigger_args[0].lower() == "where": - bot.osd(["[Location search for " + str(searchterm) + "]", str(searchreturn)]) - else: - bot.osd(["[Information search for '" + str(searchterm) + "']", str(searchreturn)]) + bot.osd(["[Information search for '" + str(searchterm) + "']", str(searchreturn)]) return elif trigger_args[0].lower() in ["can", "have"] and trigger_args[1].lower() in ["you"] and trigger_args[2].lower() in ["see", "seen"]: diff --git a/sopel_modules/SpiceBot_Core_Commands/DictComs.py b/sopel_modules/SpiceBot_Core_Commands/DictComs.py index 9a5e9e3..a6e2d89 100644 --- a/sopel_modules/SpiceBot_Core_Commands/DictComs.py +++ b/sopel_modules/SpiceBot_Core_Commands/DictComs.py @@ -310,7 +310,7 @@ def bot_dictcom_search(bot, trigger, botcom): if not searchreturn: botcom.dict["success"] = False - failmessage = ['I cannot find anything about that'] + failmessage = ["[" + searchdict["query_type"].upper() + " search for '" + str(searchterm) + "']" + 'I cannot find anything about that'] if botcom.dict["dict"][botcom.dict["responsekey"]]["search_fail"]: failmessage = botcom.dict["dict"][botcom.dict["responsekey"]]["search_fail"] botcom.dict["dict"][botcom.dict["responsekey"]]["responses"] = failmessage diff --git a/sopel_modules/SpiceBot_Core_Tools/Search.py b/sopel_modules/SpiceBot_Core_Tools/Search.py index 6cf8898..eda041a 100644 --- a/sopel_modules/SpiceBot_Core_Tools/Search.py +++ b/sopel_modules/SpiceBot_Core_Tools/Search.py @@ -50,7 +50,7 @@ def gifapi_triggers(bot, trigger, botcom): searchreturn = SpiceBot.search.search(searchdict) if not searchreturn: - SpiceBot.messagelog.messagelog_error(botcom.dict["log_id"], "[" + botcom.dict["realcom"].upper() + " search for '" + str(searchterm) + "']" + 'I cannot find anything about that') + SpiceBot.messagelog.messagelog_error(botcom.dict["log_id"], "[" + botcom.dict["realcom"].upper() + " search for '" + str(searchterm) + "'] " + 'I cannot find anything about that') else: bot.osd(["[" + botcom.dict["realcom"].upper() + " search for '" + str(searchterm) + "']", str(searchreturn)])