From 5ddef463315affdafb1a1d4a42cb39e9c74376c5 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Fri, 20 Sep 2019 10:50:28 -0400 Subject: [PATCH] test --- .../SpiceBot_DictComs/search/spiceworks.json | 2 ++ sopel_modules/SpiceBot_Core_Commands/DictComs.py | 11 ++--------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/search/spiceworks.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/search/spiceworks.json index cc80061..b4aec04 100644 --- a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/search/spiceworks.json +++ b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/search/spiceworks.json @@ -2,6 +2,8 @@ "?default": { "type": "search", "responses": "spiceworks", + "blank_required": True, + "blank_fail": ["https://www.spiceworks.com/"], "search_fail": ["No Spiceworks forum posts found!"], }, } diff --git a/sopel_modules/SpiceBot_Core_Commands/DictComs.py b/sopel_modules/SpiceBot_Core_Commands/DictComs.py index fb98523..2c2dea8 100644 --- a/sopel_modules/SpiceBot_Core_Commands/DictComs.py +++ b/sopel_modules/SpiceBot_Core_Commands/DictComs.py @@ -300,16 +300,9 @@ def bot_dictcom_search(bot, trigger, botcom): elif botcom.dict["dict"][botcom.dict["responsekey"]]["blank_required"] and botcom.dict["completestring"]: searchterm = [botcom.dict["dict"][botcom.dict["responsekey"]]["responses"][0] + " " + botcom.dict["completestring"]] else: - searchterm = botcom.dict["dict"][botcom.dict["responsekey"]]["responses"] + searchterm = botcom.dict["dict"][botcom.dict["responsekey"]]["responses"][0] - if botcom.dict["specified"]: - if botcom.dict["specified"] > len(searchterm): - botcom.dict["specified"] = len(searchterm) - query = spicemanip(searchterm, botcom.dict["specified"], 'return') - else: - query = spicemanip(searchterm, 'random', 'return') - - searchreturn = SpiceBot.google.search(query) + searchreturn = SpiceBot.google.search(searchterm) if not searchreturn: botcom.dict["success"] = False