Skip to content

Commit

Permalink
Backport pull request #2254
Browse files Browse the repository at this point in the history
search: consistently warn about excessive "site:" operators if no results
  • Loading branch information
dgw committed Feb 16, 2022
1 parent 7351d67 commit c9dd730
Showing 1 changed file with 15 additions and 2 deletions.
17 changes: 15 additions & 2 deletions sopel/modules/search.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,12 @@ def bing(bot, trigger):
if result:
bot.say(result)
else:
bot.reply("No results found for '%s'." % query)
msg = "No results found for '%s'." % query
if query.count('site:') >= 2:
# This check exists because of issue #1415. The git.io link will take the user there.
# (Better a sopel.chat link, but it's not set up to do that. This is shorter anyway.)
msg += " Try again with at most one 'site:' operator. See https://git.io/fpKtP for why."
bot.reply(msg)


@plugin.command('search')
Expand All @@ -150,7 +155,15 @@ def search(bot, trigger):
bu = bing_search(query) or '-'
du = duck_search(query) or '-'

if bu == du:
if bu == '-' and du == '-':
msg = "No results found for '%s'." % query
if query.count('site:') >= 2:
# This check exists because of issue #1415. The git.io link will take the user there.
# (Better a sopel.chat link, but it's not set up to do that. This is shorter anyway.)
msg += " Try again with at most one 'site:' operator. See https://git.io/fpKtP for why."
bot.reply(msg)
return
elif bu == du:
result = '%s (b, d)' % bu
else:
if len(bu) > 150:
Expand Down

0 comments on commit c9dd730

Please sign in to comment.