Updates the IRC authentication method to no longer need ib3 (#1282)

This changes the IRC authentication to be done using the IRC package instead of the ib3 packages.

Author: ajax146

Pipfile

@@ -20,9 +20,8 @@ flake8-variables-names = "==0.0.6"
 gino = "==1.0.1"
 gitpython = "==3.1.44"
 hypothesis = "==6.131.9"
-ib3 = "==0.2.0"
 inflect = "==7.3.1"
-irc = "==20.1.0"
+irc = "==20.5.0"
 isort = "==6.0.1"
 munch = "==4.0.0"
 typing_extensions = "==4.8.0"

Pipfile.lock

@@ -1042,22 +1042,30 @@ async def can_run(
     # IRC Stuff
 
     async def start_irc(self: Self) -> None:
-        """Starts the IRC connection in a seperate thread"""
-        irc_config = self.file_config.api.irc
+        """Starts the IRC bot in a separate thread."""
         main_loop = asyncio.get_running_loop()
+        irc_config = self.file_config.api.irc
 
-        irc_bot = ircrelay.IRCBot(
+        # Create the bot instance
+        irc_bot = ircrelay.relay.IRCBot(
             loop=main_loop,
             server=irc_config.server,
             port=irc_config.port,
             channels=irc_config.channels,
             username=irc_config.name,
             password=irc_config.password,
         )
+
         self.irc = irc_bot
 
-        irc_thread = threading.Thread(target=irc_bot.start)
+        def run_in_thread() -> None:
+            """Run the IRC bot in a separate thread."""
+            irc_bot.start_bot()
+
+        # Start the bot in a new thread
         await self.logger.send_log(
-            message="Logging in to IRC", level=LogLevel.INFO, console_only=True
+            message="Logging into IRC", level=LogLevel.INFO, console_only=True
         )
-        irc_thread.start()
+
+        bot_thread = threading.Thread(target=run_in_thread)
+        bot_thread.start()

techsupport_bot/bot.py

@@ -1,4 +1,4 @@
 """Allows python to find the irc packages"""
 
 from .formatting import *
-from .irc import *
+from .relay import *

techsupport_bot/ircrelay/__init__.py

@@ -4,21 +4,22 @@
 from __future__ import annotations
 
 import asyncio
+import functools
 import logging
 import os
+import ssl
 import threading
 from typing import Self
 
 import commands
 import discord
-import ib3.auth
 import irc.bot
 import irc.client
-import irc.strings
+import irc.connection
 from ircrelay import formatting
 
 
-class IRCBot(ib3.auth.SASL, irc.bot.SingleServerIRCBot):
+class IRCBot(irc.bot.SingleServerIRCBot):
     """The IRC bot class. This is the class that runs the entire IRC side of the bot
     The class to start the entire IRC bot
 
@@ -58,25 +59,42 @@ def __init__(
         username: str,
         password: str,
     ) -> None:
-
         self.loop = loop
+        self.username = username
+        self.password = password
+        self.join_channel_list = channels
+
+        # SSL context setup
+        context = ssl.create_default_context()
+        factory = irc.connection.Factory(
+            wrapper=functools.partial(context.wrap_socket, server_hostname=server)
+        )
+
+        # Pass the correct server info and password
         super().__init__(
-            server_list=[(server, port)],
+            server_list=[
+                (server, port, password)
+            ],  # Ensure this has the correct password
             realname=username,
             nickname=username,
-            ident_password=password,
-            channels=channels,
+            connect_factory=factory,
         )
-        self.join_channel_list = channels
-        self.username = username
-        self.password = password
+
+        # Reconnect handler if disconnected
         self._on_disconnect = self.reconnect_from_disconnect
 
     def exit_irc(self: Self) -> None:
         """Instatly kills the IRC thread"""
         # pylint: disable=protected-access
         os._exit(1)
 
+    def start_bot(self: Self) -> None:
+        """Start the bot and handle SASL authentication."""
+        self.connection.set_rate_limit(1)  # Be nice to server
+        self.connection.username = self.username
+        self.connection.sasl_login = self.username
+        self.start()  # Starts the IRC bot's main loop
+
     def reconnect_from_disconnect(
         self: Self, connection: irc.client.ServerConnection, event: irc.client.Event
     ) -> None: