Merge branch 'main' into ProtectTheSecond

Author: ajax146

.flake8

@@ -1,4 +1,4 @@
 [flake8]
-ignore = DCO010, DCO023, E203, E501, E712, F401, F403, F821, W503
+ignore = DCO010, DCO023, DOC503, DOC602, DOC603, E203, E501, E712, F401, F403, F821, W503
 style = google
 skip-checking-short-docstrings = False

.pylintrc

@@ -75,6 +75,7 @@ disable=C0103,
         R0914,
         R0915,
         R0916,
+        R0917,
         W0201,
         W0231,
         W0406,

Pipfile

@@ -5,37 +5,36 @@ verify_ssl = true
 
 [packages]
 aiocron = "==1.8"
-bidict = "==0.22.1"
-black = "==24.4.2"
+bidict = "==0.23.1"
+black = "==25.1.0"
 dateparser = "1.2.0"
-"discord.py" = "==2.4.0"
-emoji = "==2.11.1"
+"discord.py" = "==2.5.2"
+emoji = "==2.14.1"
 expiringdict = "==1.2.2"
-flake8 = "==7.1.0"
+flake8 = "==7.2.0"
 flake8-annotations = "==3.1.1"
-flake8-bugbear = "==24.4.26"
-flake8-docstrings-complete = "==1.3.0"
+flake8-bugbear = "==24.12.12"
+flake8-docstrings-complete = "==1.4.1"
 flake8-modern-annotations = "==1.6.0"
 flake8-variables-names = "==0.0.6"
 gino = "==1.0.1"
-gitpython = "==3.1.43"
-hypothesis = "==6.108.3"
-ib3 = "==0.2.0"
-inflect = "==7.3.1"
-irc = "==20.1.0"
-isort = "==5.13.2"
+gitpython = "==3.1.44"
+hypothesis = "==6.131.9"
+inflect = "==7.5.0"
+irc = "==20.5.0"
+isort = "==6.0.1"
 munch = "==4.0.0"
 typing_extensions = "==4.8.0"
-pip = "==24.1.1"
-pipenv = "==2024.0.1"
-pydantic = "==2.7.0"
-pydoclint = "==0.4.1"
-pylint = "==3.1.0"
+pip = "==25.1"
+pipenv = "==2025.0.1"
+pydantic = "==2.9.2"
+pydoclint = "==0.6.6"
+pylint = "==3.3.6"
 pynacl = "==1.5.0"
-pytest = "==8.2.2"
-pytest-asyncio = "==0.23.7"
+pytest = "==8.3.5"
+pytest-asyncio = "==0.26.0"
 pyyaml = "==6.0.1"
-unidecode = "==1.3.8"
+unidecode = "==1.4.0"
 
 [requires]
 python_version = "3.11"

Pipfile.lock

@@ -39,7 +39,7 @@ class TechSupportBot(commands.Bot):
         allowed_mentions (discord.AllowedMentions): What the bot is, or is not,
             allowed to mention
 
-    Attrs:
+    Attributes:
         CONFIG_PATH (str): The hard coded path to the yaml config file
         EXTENSIONS_DIR_NAME (str): The hardcoded folder for commands
         EXTENSIONS_DIR (str): The list of all files in the EXTENSIONS_DIR_NAME folder
@@ -918,7 +918,7 @@ async def interaction_check(self: Self, interaction: discord.Interaction) -> boo
         await self.slash_command_log(interaction)
 
         await self.logger.send_log(
-            message="Checking if prefix command can run",
+            message="Checking if slash command can run",
             level=LogLevel.DEBUG,
             context=LogContext(guild=interaction.guild, channel=interaction.channel),
             console_only=True,
@@ -1045,22 +1045,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

@@ -12,27 +12,27 @@ class LogLevel(Enum):
     """This is a way to map log levels to strings, and have the easy ability
     to dynamically add or remove log levels
 
-    Attrs:
+    Attributes:
         DEBUG (str): Representation of debug
         INFO (str): Representation of info
         WARNING (str): Representation of warning
         ERROR (str): Representation of error
     """
 
-    DEBUG = "debug"
-    INFO = "info"
-    WARNING = "warning"
-    ERROR = "error"
+    DEBUG: str = "debug"
+    INFO: str = "info"
+    WARNING: str = "warning"
+    ERROR: str = "error"
 
 
 @dataclass
 class LogContext:
     """A very simple class to store a few contextual items about the log
     This is used to determine if some guild settings means the log shouldn't be logged
 
-    Attrs:
+    Attributes:
         guild (discord.Guild | None): The guild the log occured with. Optional
-        channel (discord.abc.Messageble | None): The channel, DM, thread,
+        channel (discord.abc.Messageable | None): The channel, DM, thread,
             or other messagable the log occured in
     """
 

techsupport_bot/botlogging/common.py

@@ -15,13 +15,13 @@ class LogEmbed(discord.Embed):
     Args:
         message (str): The message to log. Will become the description of an embed
 
-    Attrs:
+    Attributes:
         title (str): The title of the embed
         color (discord.Color): The color of the embed
     """
 
-    title = None
-    color = None
+    title: str = None
+    color: discord.Color = None
 
     def __init__(self: Self, message: str) -> None:
         super().__init__(
@@ -49,46 +49,46 @@ def modify_embed(self: Self, embed: discord.Embed) -> discord.Embed:
 class InfoEmbed(LogEmbed):
     """Embed for info level log events.
 
-    Attrs:
+    Attributes:
         title (str): The title of the embed
         color (discord.Color): The color of the embed
     """
 
-    title = "info"
-    color = discord.Color.green()
+    title: str = "info"
+    color: discord.Color = discord.Color.green()
 
 
 class DebugEmbed(LogEmbed):
     """Embed for debug level log events.
 
-    Attrs:
+    Attributes:
         title (str): The title of the embed
         color (discord.Color): The color of the embed
     """
 
-    title = "debug"
-    color = discord.Color.dark_green()
+    title: str = "debug"
+    color: discord.Color = discord.Color.dark_green()
 
 
 class WarningEmbed(LogEmbed):
     """Embed for warning level log events.
 
-    Attrs:
+    Attributes:
         title (str): The title of the embed
         color (discord.Color): The color of the embed
     """
 
-    title = "warning"
-    color = discord.Color.gold()
+    title: str = "warning"
+    color: discord.Color = discord.Color.gold()
 
 
 class ErrorEmbed(LogEmbed):
     """Embed for error level log events.
 
-    Attrs:
+    Attributes:
         title (str): The title of the embed
         color (discord.Color): The color of the embed
     """
 
-    title = "error"
-    color = discord.Color.red()
+    title: str = "error"
+    color: discord.Color = discord.Color.red()

techsupport_bot/botlogging/embed.py

@@ -18,5 +18,6 @@
 from .mock import *
 from .moderator import *
 from .modlog import *
+from .relay import *
 from .roll import *
 from .wyr import *

techsupport_bot/commands/__init__.py

@@ -24,17 +24,17 @@ async def setup(bot: bot.TechSupportBot) -> None:
 class Animals(cogs.BaseCog):
     """The class for the animals commands
 
-    Attrs:
+    Attributes:
         CAT_API_URL (str): The URL for the cat API
         DOG_API_URL (str): The URL for the dog API
         FOX_API_URL (str): The URL for the fox API
         FROG_API_URL (str): The URL for the frog API
     """
 
-    CAT_API_URL = "https://api.thecatapi.com/v1/images/search?limit=1&api_key={}"
-    DOG_API_URL = "https://dog.ceo/api/breeds/image/random"
-    FOX_API_URL = "https://randomfox.ca/floof/"
-    FROG_API_URL = "https://frogs.media/api/random"
+    CAT_API_URL: str = "https://api.thecatapi.com/v1/images/search?limit=1&api_key={}"
+    DOG_API_URL: str = "https://dog.ceo/api/breeds/image/random"
+    FOX_API_URL: str = "https://randomfox.ca/floof/"
+    FROG_API_URL: str = "https://frogs.media/api/random"
 
     @auxiliary.with_typing
     @commands.command(name="cat", brief="Gets a cat", description="Gets a cat")

techsupport_bot/commands/animal.py

@@ -20,17 +20,17 @@ class ApplicationStatus(Enum):
     """Static string mapping of all status
     This is so the database can always be consistent
 
-    Attrs:
+    Attributes:
         PENDING (str): The string representation for pending
         APPROVED (str): The string representation for approved
         DENIED (str): The string representation for denied
         REJECTED (str): The string representation for rejected
     """
 
-    PENDING = "pending"
-    APPROVED = "approved"
-    DENIED = "denied"
-    REJECTED = "rejected"
+    PENDING: str = "pending"
+    APPROVED: str = "approved"
+    DENIED: str = "denied"
+    REJECTED: str = "rejected"
 
 
 async def setup(bot: bot.TechSupportBot) -> None:
@@ -198,11 +198,11 @@ async def wait(self: Self, config: munch.Munch, guild: discord.Guild) -> None:
 class ApplicationManager(cogs.LoopCog):
     """This cog is responsible for the majority of functions in the application system
 
-    Attrs:
+    Attributes:
         application_group (app_commands.Group): The group for the /application commands
     """
 
-    application_group = app_commands.Group(
+    application_group: app_commands.Group = app_commands.Group(
         name="application", description="...", extras={"module": "application"}
     )
 
@@ -557,7 +557,7 @@ async def start_application(self: Self, interaction: discord.Interaction) -> Non
         )
 
         await interaction.followup.send(
-            f"Your application has been recieved, {interaction.user.display_name}!",
+            f"Your application has been received, {interaction.user.display_name}!",
             ephemeral=True,
         )