diff --git a/bot.py b/bot.py index d308975..0736b89 100755 --- a/bot.py +++ b/bot.py @@ -25,9 +25,8 @@ class Server(BaseServer): reader, writer = await transport.connect( params.host, params.port, - tls =params.tls, - tls_verify=params.tls_verify, - bindhost =params.bindhost) + tls =params.tls, + bindhost =params.bindhost) self._reader = reader self._writer = writer @@ -55,7 +54,7 @@ class Server(BaseServer): if text[:len(self.nickname)+2].lower() == f'{self.nickname}: '.lower(): args = text[len(self.nickname)+2:].split(' ') if args[0] == 'connect' and len(args) > 4: - await self.bot.add_server(args[1],ConnectionParams(NICKNAME,args[2],args[3],bool(int(args[4])))) + await self.bot.add_server(args[1],ConnectionParams(NICKNAME,args[2],args[3])) await self.send(build("PRIVMSG",[self.chan,"Connected to {} :3".format(args[1])])) return if args[0] == 'unlink' and len(args) > 1: @@ -120,8 +119,8 @@ def find_all_indexes(input_str, search_str): async def main(): bot = Bot() - for name, host, port, ssl in SERVERS: - params = ConnectionParams(NICKNAME, host, port, ssl) + for name, host, port in SERVERS: + params = ConnectionParams(NICKNAME, host, port) await bot.add_server(name, params) await bot.run() diff --git a/config.py.example b/config.py.example index cf6d260..df4e62b 100644 --- a/config.py.example +++ b/config.py.example @@ -1,10 +1,10 @@ # name hostname port tls SERVERS = [ - ("tilde", "irc.tilde.chat.invalid", 6697, True), - ("technet","irc.technet.xi.ht.invalid", 6697, True), - ("vulpineawoo","foxes.are.allowed.org.invalid", 6697, True), - ("alphachat","irc.alphachat.net.invalid", 6697, True), + ("tilde", "irc.tilde.chat.invalid", 6697), + ("technet","irc.technet.xi.ht.invalid", 6697), + ("vulpineawoo","foxes.are.allowed.org.invalid", 6697), + ("alphachat","irc.alphachat.net.invalid", 6697), ] NICKNAME = 'testrelay'