Skip to content

adminchannel, coretasks: improve handling of bot's current nick #2240

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.

Sign up for GitHub

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

Merged
dgw merged 2 commits into from
Jan 27, 2022
Merged

adminchannel, coretasks: improve handling of bot's current nick #2240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b814561
adminchannel: check kicks against bot's *current* nick
dgw Jan 21, 2022
679fa83
coretasks: additional handling of forced nick-change
dgw Jan 21, 2022
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
39 changes: 26 additions & 13 deletions sopel/coretasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,19 +672,32 @@ def track_nicks(bot, trigger):

# Give debug message, and PM the owner, if the bot's own nick changes.
if old == bot.nick and new != bot.nick:
privmsg = (
"Hi, I'm your bot, %s. Something has made my nick change. This "
"can cause some problems for me, and make me do weird things. "
"You'll probably want to restart me, and figure out what made "
"that happen so you can stop it happening again. (Usually, it "
"means you tried to give me a nick that's protected by NickServ.)"
) % bot.nick
debug_msg = (
"Nick changed by server. This can cause unexpected behavior. "
"Please restart the bot."
)
LOGGER.critical(debug_msg)
bot.say(privmsg, bot.config.core.owner)
# Is this the original nick being regained?
# e.g. by ZNC's keepnick module running in front of Sopel
if old != bot.config.core.nick and new == bot.config.core.nick:
LOGGER.info(
"Regained configured nick. Restarting is still recommended.")
else:
privmsg = (
"Hi, I'm your bot, %s. Something has made my nick change. This "
"can cause some problems for me, and make me do weird things. "
"You'll probably want to restart me, and figure out what made "
"that happen so you can stop it happening again. (Usually, it "
"means you tried to give me a nick that's protected by NickServ.)"
) % bot.config.core.nick
debug_msg = (
"Nick changed by server. This can cause unexpected behavior. "
"Please restart the bot."
)
LOGGER.critical(debug_msg)
bot.say(privmsg, bot.config.core.owner)

# Always update bot.nick anyway so Sopel doesn't lose its self-identity.
# This should cut down the number of "weird things" that happen while
# the active nick doesn't match the config, but it's not a substitute
# for regaining the expected nickname.
LOGGER.info("Updating bot.nick property with server-changed nick.")
bot._nick = new
return

for channel in bot.channels.values():
Expand Down
8 changes: 6 additions & 2 deletions sopel/modules/adminchannel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,12 @@ def kick(bot, trigger):
channel = opt
reasonidx = 3
reason = ' '.join(text[reasonidx:])
if nick != bot.make_identifier(bot.config.core.nick):
bot.kick(nick, channel, reason)

if nick == bot.nick:
bot.reply("Hey! Don't kick me. :(")
return

bot.kick(nick, channel, reason)


def configureHostMask(mask):
Expand Down