diff options
Diffstat (limited to 'src/core_modules')
| -rw-r--r-- | src/core_modules/nick_regain.py | 38 |
1 files changed, 28 insertions, 10 deletions
diff --git a/src/core_modules/nick_regain.py b/src/core_modules/nick_regain.py index cf1dfa48..8f846458 100644 --- a/src/core_modules/nick_regain.py +++ b/src/core_modules/nick_regain.py @@ -2,8 +2,8 @@ from src import ModuleManager, utils class Module(ModuleManager.BaseModule): def _done_connecting(self, server): - target_nick = server.connection_params.nickname - if not server.irc_equals(server.nickname, target_nick): + target_nick = self._target(server) + if not self._regained(server, target_nick): if "MONITOR" in server.isupport: server.send_raw("MONITOR + %s" % target_nick) else: @@ -17,16 +17,34 @@ class Module(ModuleManager.BaseModule): def no_motd(self, event): self._done_connecting(event["server"]) + def _regained(self, server, target_nickname): + return server.irc_equals(target_nickname, server.nickname) + def _target(self, server): + return server.connection_params.nickname + @utils.hook("self.nick") def self_nick(self, event): - target_nick = event["server"].connection_params.nickname - if event["server"].irc_equals(event["new_nickname"], target_nick): + target_nick = self._target(event["server"]) + if self._regained(event["server"], target_nick): if "MONITOR" in event["server"].isupport: event["server"].send_raw("MONITOR - %s " % target_nick) + @utils.hook("received.nick") + def nick(self, event): + self._check(event["server"], event["old_nickname"]) + @utils.hook("received.quit") + def quit(self, event): + self._check(event["server"], event["user"].nickname) + + def _check(self, server, nickname): + target_nick = self._target(server) + if (not self._regained(server, target_nick) + and server.irc_equals(nickname, target_nick)): + server.send_nick(target_nick) + @utils.hook("received.731") def mon_offline(self, event): - target_nick = event["server"].connection_params.nickname + target_nick = self._target(event["server"]) nicks = event["line"].args[1].split(",") nicks = [event["server"].irc_lower(n) for n in nicks] if event["server"].irc_lower(target_nick) in nicks: @@ -34,15 +52,15 @@ class Module(ModuleManager.BaseModule): def _ison_check(self, timer): server = timer.kwargs["server"] - target_nick = server.connection_params.nickname - if not server.irc_equals(server.nickname, target_nick): + target_nick = self._target(server) + if not self._regained(server, target_nick): server.send_raw("ISON %s" % target_nick) timer.redo() @utils.hook("received.303") def ison_response(self, event): - target_nick = event["server"].connection_params.nickname - if not event["line"].args[1] and not event["server"].irc_equals( - event["server"].nickname, target_nick): + target_nick = self._target(event["server"]) + if (not event["line"].args[1] and + not self._regained(event["server"], target_nick)): event["server"].send_nick(target_nick) |