Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tell: avoid errors produced by empty tellee #2584

Merged
merged 2 commits into from
Dec 18, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions sopel/builtins/tell.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,14 @@ def f_remind(bot, trigger):
verb = trigger.group(1)

if not trigger.group(3):
tellee = ""
else:
tellee = trigger.group(3).rstrip('.,:;').lstrip('@')

if not tellee:
bot.reply("%s whom?" % verb)
return

tellee = trigger.group(3).rstrip('.,:;')

# all we care about is having at least one non-whitespace
# character after the name
if not trigger.group(4):
Expand All @@ -204,9 +207,6 @@ def f_remind(bot, trigger):
bot.reply('That nickname is too long.')
return

if tellee[0] == '@':
tellee = tellee[1:]

if tellee == bot.nick:
bot.reply("I'm here now; you can %s me whatever you want!" % verb)
return
Expand Down