From a88e008b0f064c4bda8e57b254e16e6bf05ae012 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Fri, 20 Sep 2019 14:43:41 -0400 Subject: [PATCH] test --- sopel_modules/SpiceBot/Search.py | 2 +- sopel_modules/SpiceBot_Core_Tools/Search.py | 24 +++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/sopel_modules/SpiceBot/Search.py b/sopel_modules/SpiceBot/Search.py index e871866..47388ff 100644 --- a/sopel_modules/SpiceBot/Search.py +++ b/sopel_modules/SpiceBot/Search.py @@ -40,7 +40,7 @@ class Search(): if apikey: self.valid_api[search_api]["apikey"] = apikey - self.valid_api[search_api]["comtype"] = "gif_prefix" + self.valid_api[search_api]["comtype"] = "search_prefix" self.valid_api[search_api]["validcoms"] = [self.valid_api[search_api]["filename"]] botcommands.register(self.valid_api[search_api]) diff --git a/sopel_modules/SpiceBot_Core_Tools/Search.py b/sopel_modules/SpiceBot_Core_Tools/Search.py index 24f96e6..5a595be 100644 --- a/sopel_modules/SpiceBot_Core_Tools/Search.py +++ b/sopel_modules/SpiceBot_Core_Tools/Search.py @@ -30,6 +30,30 @@ def search_main(bot, trigger, botcom): bot.osd(["[Information search for '" + str(searchterm) + "']", str(searchreturn)]) +@SpiceBot.prerun('module', "search_prefix") +@sopel.module.commands('(.*)') +def gifapi_triggers(bot, trigger, botcom): + + if botcom.dict['com'] not in list(SpiceBot.search.valid_api.keys()): + return + + searchterm = spicemanip(botcom.dict['args'], 0) or None + if not searchterm: + SpiceBot.messagelog.messagelog_error(botcom.dict["log_id"], "Not sure what you want me to look for.") + return + + searchdict = { + "query": searchterm, + "query_type": botcom.dict["realcom"], + } + + searchreturn = SpiceBot.search.search(searchdict) + if not searchreturn: + SpiceBot.messagelog.messagelog_error(botcom.dict["log_id"], 'I cannot find anything about that') + else: + bot.osd(["[" + botcom.dict["realcom"].upper() + " search for '" + str(searchterm) + "']", str(searchreturn)]) + + @SpiceBot.prerun('module') @sopel.module.commands("where", "whereis") def search_where(bot, trigger, botcom):