Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

refactor nick_regain, also look for NICK/QUIT for regain

Browse source
This commit is contained in:
jesopo 2019-12-25 01:41:01 +00:00
parent 3f3845a964
commit a5e7767f80
1 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/core_modules/nick_regain.py
View file

@ -2,8 +2,8 @@ from src import ModuleManager, utils
class Module(ModuleManager.BaseModule): class Module(ModuleManager.BaseModule):
def _done_connecting(self, server): def _done_connecting(self, server):
target_nick = server.connection_params.nickname target_nick = self._target(server)
if not server.irc_equals(server.nickname, target_nick): if not self._regained(server, target_nick):
if "MONITOR" in server.isupport: if "MONITOR" in server.isupport:
server.send_raw("MONITOR + %s" % target_nick) server.send_raw("MONITOR + %s" % target_nick)
else: else:
@ -17,16 +17,34 @@ class Module(ModuleManager.BaseModule):
def no_motd(self, event): def no_motd(self, event):
self._done_connecting(event["server"]) 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") @utils.hook("self.nick")
def self_nick(self, event): def self_nick(self, event):
target_nick = event["server"].connection_params.nickname target_nick = self._target(event["server"])
if event["server"].irc_equals(event["new_nickname"], target_nick): if self._regained(event["server"], target_nick):
if "MONITOR" in event["server"].isupport: if "MONITOR" in event["server"].isupport:
event["server"].send_raw("MONITOR - %s " % target_nick) 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") @utils.hook("received.731")
def mon_offline(self, event): 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["line"].args[1].split(",")
nicks = [event["server"].irc_lower(n) for n in nicks] nicks = [event["server"].irc_lower(n) for n in nicks]
if event["server"].irc_lower(target_nick) in nicks: if event["server"].irc_lower(target_nick) in nicks:
@ -34,15 +52,15 @@ class Module(ModuleManager.BaseModule):
def _ison_check(self, timer): def _ison_check(self, timer):
server = timer.kwargs["server"] server = timer.kwargs["server"]
target_nick = server.connection_params.nickname target_nick = self._target(server)
if not server.irc_equals(server.nickname, target_nick): if not self._regained(server, target_nick):
server.send_raw("ISON %s" % target_nick) server.send_raw("ISON %s" % target_nick)
timer.redo() timer.redo()
@utils.hook("received.303") @utils.hook("received.303")
def ison_response(self, event): def ison_response(self, event):
target_nick = event["server"].connection_params.nickname target_nick = self._target(event["server"])
if not event["line"].args[1] and not event["server"].irc_equals( if (not event["line"].args[1] and
event["server"].nickname, target_nick): not self._regained(event["server"], target_nick)):
event["server"].send_nick(target_nick) event["server"].send_nick(target_nick)