diff --git a/sopel_modules/SpiceBot/Search.py b/sopel_modules/SpiceBot/Search.py index c448057..83a64f5 100644 --- a/sopel_modules/SpiceBot/Search.py +++ b/sopel_modules/SpiceBot/Search.py @@ -12,6 +12,8 @@ from .Config import config as botconfig from .Read import read as botread from .Commands import commands as botcommands +from .Logs import logs + # TODO add a cache flush @@ -100,11 +102,12 @@ class Search(): # url base url = str(searchdict["url"]) # query - url += str(self.valid_api[searchdict["query_type"]]) + str(searchdict["query"]) + url += str(self.valid_api[searchdict["query_param"]]) + str(searchdict["query"]) # nsfw search? TODO # additional parts if "additional_url" in list(self.valid_api[searchdict["query_type"]].keys()): url += str(self.valid_api[searchdict["query_type"]]['additional_url']) + logs.log('SpiceBot_Search', str(url)) return url diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_Search/gmaps.json b/sopel_modules/SpiceBot_Configs/SpiceBot_Search/gmaps.json index 34b84c3..ef8e5c6 100644 --- a/sopel_modules/SpiceBot_Configs/SpiceBot_Search/gmaps.json +++ b/sopel_modules/SpiceBot_Configs/SpiceBot_Search/gmaps.json @@ -1,4 +1,5 @@ { "url": "http://www.google.com/maps/place/", "query": '', +"query_param": '', } diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_Search/google.json b/sopel_modules/SpiceBot_Configs/SpiceBot_Search/google.json index f9f3bf5..5d1b270 100644 --- a/sopel_modules/SpiceBot_Configs/SpiceBot_Search/google.json +++ b/sopel_modules/SpiceBot_Configs/SpiceBot_Search/google.json @@ -1,5 +1,5 @@ { "url": "http://www.google.com/search?", -"query": 'q=', +"query_param": 'q=', "additional_url": "&btnI", } diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_Search/spiceworks.json b/sopel_modules/SpiceBot_Configs/SpiceBot_Search/spiceworks.json index 31f9c1d..b69aafc 100644 --- a/sopel_modules/SpiceBot_Configs/SpiceBot_Search/spiceworks.json +++ b/sopel_modules/SpiceBot_Configs/SpiceBot_Search/spiceworks.json @@ -1,4 +1,4 @@ { "url": "http://community.spiceworks.com/search?", -"query": 'query=', +"query_param": 'query=', } diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_Search/youtube.json b/sopel_modules/SpiceBot_Configs/SpiceBot_Search/youtube.json index 220eb26..ff11913 100644 --- a/sopel_modules/SpiceBot_Configs/SpiceBot_Search/youtube.json +++ b/sopel_modules/SpiceBot_Configs/SpiceBot_Search/youtube.json @@ -1,5 +1,5 @@ { "url": "http://www.youtube.com/search?", -"query": 'q=', +"query_param": 'q=', "additional_url": "&btnI", }