diff --git a/sopel_modules/SpiceBot/Google.py b/sopel_modules/SpiceBot/Google.py index 5607df1..5f5a7db 100644 --- a/sopel_modules/SpiceBot/Google.py +++ b/sopel_modules/SpiceBot/Google.py @@ -35,17 +35,19 @@ class Google(): data = searchterm.replace(' ', '+') lookfor = data.replace(':', '%3A') try: + if searchtype == 'info': + url = "http://www.google.com" + elif searchtype == 'maps': + url = "http://www.google.com" + elif searchtype == 'youtube': + url = "https://www.youtube.com" + else: + url = "http://www.google.com" + query = {'q': searchterm} if searchtype == 'maps': var = requests.get(r'http://www.google.com/maps/place/' + lookfor, headers=header) - elif searchtype == 'info': - url = "http://www.google.com" - query = {'q': searchterm} - var = requests.get(url, params=query) - # var = requests.get(r'http://www.google.com/search?q=' + lookfor + '&btnI', headers=header) - elif searchtype == 'youtube': - var = requests.get(r'https://www.youtube.com/search?q=' + lookfor + '&btnI', headers=header) else: - var = requests.get(r'http://www.google.com/search?q=' + lookfor + '&btnI', headers=header) + var = requests.get(url, params=query) except Exception as e: var = e var = None diff --git a/sopel_modules/SpiceBot_Core_Commands/Search.py b/sopel_modules/SpiceBot_Core_Commands/Search.py index 0e9dfc6..9f2f622 100644 --- a/sopel_modules/SpiceBot_Core_Commands/Search.py +++ b/sopel_modules/SpiceBot_Core_Commands/Search.py @@ -12,7 +12,7 @@ import sopel_modules.SpiceBot as SpiceBot @SpiceBot.prerun.prerun('module') @sopel.module.commands('search', 'find', 'google', 'lookup') -def nickname_comand_commands(bot, trigger): +def search_main(bot, trigger): searchterm = spicemanip.main(trigger.sb['args'], 0) or None if not searchterm: @@ -24,3 +24,51 @@ def nickname_comand_commands(bot, trigger): bot.osd('I cannot find anything about that') else: bot.osd(["[Information search for '" + str(searchterm) + "']", str(searchreturn)]) + + +@SpiceBot.prerun.prerun('module') +@sopel.module.commands("where", "whereis") +def search_where(bot, trigger): + + searchterm = spicemanip.main(trigger.sb['args'], 0) or None + if not searchterm: + bot.osd("Not sure what you want me to look for.") + return + + searchreturn = SpiceBot.google.search(searchterm, 'maps') + if not searchreturn: + bot.osd('I cannot find anything about that') + else: + bot.osd(["[Location search for " + str(searchterm) + "]", str(searchreturn)]) + + +@SpiceBot.prerun.prerun('module') +@sopel.module.commands("what", "whatis") +def search_what(bot, trigger): + + searchterm = spicemanip.main(trigger.sb['args'], 0) or None + if not searchterm: + bot.osd("Not sure what you want me to look for.") + return + + searchreturn = SpiceBot.google.search(searchterm) + if not searchreturn: + bot.osd('I cannot find anything about that') + else: + bot.osd(["[Information search for '" + str(searchterm) + "']", str(searchreturn)]) + + +@SpiceBot.prerun.prerun('module') +@sopel.module.commands("youtube", "video") +def search_video(bot, trigger): + + searchterm = spicemanip.main(trigger.sb['args'], 0) or None + if not searchterm: + bot.osd("Not sure what you want me to look for.") + return + + searchreturn = SpiceBot.google.search(searchterm, 'youtube') + if not searchreturn: + bot.osd('I cannot find anything about that') + else: + bot.osd(["[Youtube search for '" + str(searchterm) + "']", str(searchreturn)])