diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py index 42c2b80..078d3b1 100644 --- a/sopel_modules/SpiceBot/Database.py +++ b/sopel_modules/SpiceBot/Database.py @@ -612,6 +612,9 @@ class BotDatabase(): def alias_nick(self, nick, alias): return self.db.alias_nick(nick, alias) + def unalias_nick(self, alias): + return self.db.unalias_nick(alias) + def check_nick_id(self, nick): try: self.db.get_nick_id(nick, create=False) diff --git a/sopel_modules/SpiceBot/Users.py b/sopel_modules/SpiceBot/Users.py index 560596f..47e9fa4 100644 --- a/sopel_modules/SpiceBot/Users.py +++ b/sopel_modules/SpiceBot/Users.py @@ -240,12 +240,13 @@ class BotUsers(): self.mark_user_offline(nick_id) def nick(self, bot, trigger): + oldnick = trigger.nick newnick = Identifier(trigger) - if trigger.nick == bot.nick or newnick == bot.nick: + if oldnick == bot.nick or newnick == bot.nick: return # alias the nick if not botdb.check_nick_id(newnick): - botdb.alias_nick(trigger.nick, newnick) + botdb.alias_nick(oldnick, newnick) # Identify nick_id = self.whois_ident(newnick) # Verify nick is in the all list