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

move sending CAP sasl request to sasl.py

Browse source
This commit is contained in:
jesopo 2018-07-16 21:41:39 +01:00
parent f24dc72bcb
commit d0ef4432b3
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
IRCServer.py
View file

@ -61,14 +61,11 @@ class Server(object):
def connect(self): def connect(self):
self.socket.connect((self.target_hostname, self.port)) self.socket.connect((self.target_hostname, self.port))
self.bot.events.on("preprocess.connect").call(server=self)
if self.password: if self.password:
self.send_pass(self.password) self.send_pass(self.password)
sasl = self.get_setting("sasl")
if sasl:
self.send_capability_request("sasl")
self.send_user(self.original_username, self.original_realname) self.send_user(self.original_username, self.original_realname)
self.send_nick(self.original_nickname) self.send_nick(self.original_nickname)
self.connected = True self.connected = True

12
modules/sasl.py
View file

@ -3,11 +3,17 @@ import base64
class Module(object): class Module(object):
def __init__(self, bot): def __init__(self, bot):
self.bot = bot self.bot = bot
bot.events.on("received").on("cap").hook(self.on_cap) bot.events.on("preprocess.connect").hook(self.preprocess_connect)
bot.events.on("received").on("authenticate").hook(self.on_authenticate) bot.events.on("received.cap").hook(self.on_cap)
bot.events.on("received").on("numeric").on( bot.events.on("received.authenticate").hook(self.on_authenticate)
bot.events.on("received.numeric").on(
"902", "903", "904", "905", "906", "907", "908").hook(self.on_90x) "902", "903", "904", "905", "906", "907", "908").hook(self.on_90x)
def preprocess_connect(self, event):
sasl = event["server"].get_setting("sasl")
if sasl:
event["server"].send_capability_request("sasl")
def on_cap(self, event): def on_cap(self, event):
if event["subcommand"] == "NAK": if event["subcommand"] == "NAK":
event["server"].send_capability_end() event["server"].send_capability_end()