Skip to content

Commit 103e9c8

Browse files
committed
wikipedia: use say() instead of reply() when reporting a URL error
1 parent 71380df commit 103e9c8

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

sopel/modules/wikipedia.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ def mw_search(server, query, num):
173173
return None
174174

175175

176-
def say_snippet(bot, trigger, server, query, show_url=True):
176+
def say_snippet(bot, trigger, server, query, show_url=True, commanded=False):
177177
page_name = query.replace('_', ' ')
178178
query = quote(query.replace(' ', '_'))
179179
url = 'https://{}/wiki/{}'.format(server, query)
@@ -188,8 +188,11 @@ def say_snippet(bot, trigger, server, query, show_url=True):
188188
# see https://github.com/sopel-irc/sopel/issues/2259
189189
snippet = re.sub(r"\s+", " ", snippet)
190190
except KeyError:
191-
if show_url:
192-
bot.reply("Error fetching snippet for \"{}\".".format(page_name))
191+
msg = 'Error fetching snippet for "{}".'.format(page_name)
192+
if commanded:
193+
bot.reply(msg)
194+
else:
195+
bot.say(msg)
193196
return
194197

195198
msg = '{} | "{}'.format(page_name, snippet)
@@ -223,7 +226,7 @@ def say_section(bot, trigger, server, query, section):
223226

224227
snippet = mw_section(server, query, section)
225228
if not snippet:
226-
bot.reply("Error fetching section \"{}\" for page \"{}\".".format(section, page_name))
229+
bot.say('Error fetching section "{}" for page "{}".'.format(section, page_name))
227230
return
228231

229232
msg = '{} - {} | "{}"'.format(page_name, section.replace('_', ' '), snippet)
@@ -309,7 +312,7 @@ def wikipedia(bot, trigger):
309312
return plugin.NOLIMIT
310313
else:
311314
query = query[0]
312-
say_snippet(bot, trigger, server, query)
315+
say_snippet(bot, trigger, server, query, commanded=True)
313316

314317

315318
@plugin.command('wplang')

0 commit comments

Comments
 (0)