From 689f9774679a9ff414cf6b00e70e0f4c195cab05 Mon Sep 17 00:00:00 2001 From: jesopo Date: Thu, 4 Jul 2019 10:44:52 +0100 Subject: [PATCH] treat 437 the same as 433 (nickname already in use) --- modules/line_handler/__init__.py | 4 ++++ modules/line_handler/core.py | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/line_handler/__init__.py b/modules/line_handler/__init__.py index 2b9891af..76aa8a3a 100644 --- a/modules/line_handler/__init__.py +++ b/modules/line_handler/__init__.py @@ -239,6 +239,10 @@ class Module(ModuleManager.BaseModule): @utils.hook("raw.received.433", default_event=True) def handle_433(self, event): core.handle_433(event) + # nickname/channel is temporarily unavailable + @utils.hook("raw.received.437") + def handle_437(self, event): + core.handle_437(event) # we need a registered nickname for this channel @utils.hook("raw.received.477", default_event=True) diff --git a/modules/line_handler/core.py b/modules/line_handler/core.py index 3207a1a9..692e2510 100644 --- a/modules/line_handler/core.py +++ b/modules/line_handler/core.py @@ -140,6 +140,11 @@ def handle_354(event): else: target.identified_account = None +def _nick_in_use(server): + new_nick = "%s|" % server.connection_params.nickname + server.send_nick(new_nick) + def handle_433(event): - new_nick = "%s|" % event["server"].connection_params.nickname - event["server"].send_nick(new_nick) + _nick_in_use(event["server"]) +def handle_437(event): + _nick_in_use(event["server"])