refactor: Use tux.bot.Tux directly in most files instead of its subclass

Author: wakgm

tux/cogs/admin/dev.py

@@ -2,12 +2,12 @@
 from discord.ext import commands
 from loguru import logger
 
-from tux import bot
+from tux.bot import Tux
 from tux.utils import checks
 
 
 class Dev(commands.Cog):
-    def __init__(self, bot: bot.Tux) -> None:
+    def __init__(self, bot: Tux) -> None:
         self.bot = bot
 
     @commands.hybrid_group(
@@ -17,13 +17,13 @@ def __init__(self, bot: bot.Tux) -> None:
     )
     @commands.guild_only()
     @checks.has_pl(8)
-    async def dev(self, ctx: commands.Context[commands.Bot]) -> None:
+    async def dev(self, ctx: commands.Context[Tux]) -> None:
         """
         Dev related commands.
 
         Parameters
         ----------
-        ctx : commands.Context[commands.Bot]
+        ctx : commands.Context[Tux]
             The context object for the command.
 
         Raises
@@ -43,7 +43,7 @@ async def dev(self, ctx: commands.Context[commands.Bot]) -> None:
     )
     @commands.guild_only()
     @checks.has_pl(8)
-    async def sync_tree(self, ctx: commands.Context[commands.Bot], guild: discord.Guild) -> None:
+    async def sync_tree(self, ctx: commands.Context[Tux], guild: discord.Guild) -> None:
         """
         Syncs the app command tree.
 
@@ -77,7 +77,7 @@ async def sync_tree(self, ctx: commands.Context[commands.Bot], guild: discord.Gu
     )
     @commands.guild_only()
     @checks.has_pl(8)
-    async def clear_tree(self, ctx: commands.Context[commands.Bot]) -> None:
+    async def clear_tree(self, ctx: commands.Context[Tux]) -> None:
         """
         Clears the app command tree.
 
@@ -112,7 +112,7 @@ async def clear_tree(self, ctx: commands.Context[commands.Bot]) -> None:
     )
     @commands.guild_only()
     @checks.has_pl(8)
-    async def load_cog(self, ctx: commands.Context[commands.Bot], *, cog: str) -> None:
+    async def load_cog(self, ctx: commands.Context[Tux], *, cog: str) -> None:
         """
         Loads a cog into the bot.
 
@@ -153,7 +153,7 @@ async def load_cog(self, ctx: commands.Context[commands.Bot], *, cog: str) -> No
     )
     @commands.guild_only()
     @checks.has_pl(8)
-    async def unload_cog(self, ctx: commands.Context[commands.Bot], *, cog: str) -> None:
+    async def unload_cog(self, ctx: commands.Context[Tux], *, cog: str) -> None:
         """
         Unloads a cog from the bot.
 
@@ -188,7 +188,7 @@ async def unload_cog(self, ctx: commands.Context[commands.Bot], *, cog: str) ->
     )
     @commands.guild_only()
     @checks.has_pl(8)
-    async def reload_cog(self, ctx: commands.Context[commands.Bot], *, cog: str) -> None:
+    async def reload_cog(self, ctx: commands.Context[Tux], *, cog: str) -> None:
         """
         Reloads a cog in the bot.
 
@@ -223,7 +223,7 @@ async def reload_cog(self, ctx: commands.Context[commands.Bot], *, cog: str) ->
     )
     @commands.guild_only()
     @checks.has_pl(8)
-    async def stop(self, ctx: commands.Context[commands.Bot]) -> None:
+    async def stop(self, ctx: commands.Context[Tux]) -> None:
         """
         Stops the bot. If Tux is running with Docker Compose, this will restart the container.
 
@@ -239,5 +239,5 @@ async def stop(self, ctx: commands.Context[commands.Bot]) -> None:
         await self.bot.shutdown()
 
 
-async def setup(bot: bot.Tux) -> None:
+async def setup(bot: Tux) -> None:
     await bot.add_cog(Dev(bot))

tux/cogs/admin/eval.py

@@ -4,6 +4,7 @@
 from discord.ext import commands
 from loguru import logger
 
+from tux.bot import Tux
 from tux.utils import checks
 from tux.utils.embeds import EmbedCreator
 
@@ -38,7 +39,7 @@ def insert_returns(body: list[ast.stmt]) -> None:
 
 
 class Eval(commands.Cog):
-    def __init__(self, bot: commands.Bot) -> None:
+    def __init__(self, bot: Tux) -> None:
         self.bot = bot
 
     @commands.command(
@@ -48,13 +49,13 @@ def __init__(self, bot: commands.Bot) -> None:
     )
     @commands.guild_only()
     @checks.has_pl(8)  # sysadmin or higher
-    async def eval(self, ctx: commands.Context[commands.Bot], *, cmd: str) -> None:
+    async def eval(self, ctx: commands.Context[Tux], *, cmd: str) -> None:
         """
         Evaluate a Python expression. (Owner only)
 
         Parameters
         ----------
-        ctx : commands.Context[commands.Bot]
+        ctx : commands.Context[Tux]
             The context in which the command is being invoked.
         cmd : str
             The Python expression to evaluate.
@@ -128,5 +129,5 @@ async def eval(self, ctx: commands.Context[commands.Bot], *, cmd: str) -> None:
             await ctx.send(embed=embed, ephemeral=True, delete_after=30)
 
 
-async def setup(bot: commands.Bot) -> None:
+async def setup(bot: Tux) -> None:
     await bot.add_cog(Eval(bot))

tux/cogs/admin/git.py

@@ -4,6 +4,7 @@
 # from githubkit.versions.latest.models import Issue
 # from loguru import logger
 
+
 # from tux.wrappers.github import GitHubService
 # from tux.utils.constants import Constants as CONST
 # from tux.utils.embeds import EmbedCreator
@@ -18,7 +19,7 @@
 
 
 # class Git(commands.Cog):
-#     def __init__(self, bot: commands.Bot) -> None:
+#     def __init__(self, bot: Tux) -> None:
 #         self.bot = bot
 #         self.github = GitHubService()
 #         self.repo_url = CONST.GITHUB_REPO_URL
@@ -379,14 +380,15 @@
 #             logger.info(f"{interaction.user} fetched a pull request.")
 
 
-# async def setup(bot: commands.Bot) -> None:
+# async def setup(bot: Tux) -> None:
 #     await bot.add_cog(Git(bot))
 
 # TODO: Rewrite this cog to use the new hybrid command system.
 
 from discord.ext import commands
 from loguru import logger
 
+from tux.bot import Tux
 from tux.ui.buttons import GithubButton
 from tux.utils import checks
 from tux.utils.constants import Constants as CONST
@@ -395,7 +397,7 @@
 
 
 class Git(commands.Cog):
-    def __init__(self, bot: commands.Bot) -> None:
+    def __init__(self, bot: Tux) -> None:
         self.bot = bot
         self.github = GithubService()
         self.repo_url = CONST.GITHUB_REPO_URL
@@ -407,13 +409,13 @@ def __init__(self, bot: commands.Bot) -> None:
     )
     @commands.guild_only()
     @checks.has_pl(8)
-    async def git(self, ctx: commands.Context[commands.Bot]) -> None:
+    async def git(self, ctx: commands.Context[Tux]) -> None:
         """
         Github related commands.
 
         Parameters
         ----------
-        ctx : commands.Context[commands.Bot]
+        ctx : commands.Context[Tux]
             The context object for the command.
         """
 
@@ -427,13 +429,13 @@ async def git(self, ctx: commands.Context[commands.Bot]) -> None:
     )
     @commands.guild_only()
     @checks.has_pl(8)
-    async def get_repo(self, ctx: commands.Context[commands.Bot]) -> None:
+    async def get_repo(self, ctx: commands.Context[Tux]) -> None:
         """
         Get repository information.
 
         Parameters
         ----------
-        ctx : commands.Context[commands.Bot]
+        ctx : commands.Context[Tux]
             The context object for the command.
         """
 
@@ -466,13 +468,13 @@ async def get_repo(self, ctx: commands.Context[commands.Bot]) -> None:
     @commands.guild_only()
     # @checks.has_pl(8)
     @commands.has_any_role("Root", "Admin", "Contributor", "Tux Contributor", "Tux Beta Tester", "%wheel")
-    async def create_issue(self, ctx: commands.Context[commands.Bot], title: str, body: str) -> None:
+    async def create_issue(self, ctx: commands.Context[Tux], title: str, body: str) -> None:
         """
         Create an issue.
 
         Parameters
         ----------
-        ctx : commands.Context[commands.Bot]
+        ctx : commands.Context[Tux]
             The context object for the command.
         title : str
             The title of the issue.
@@ -507,13 +509,13 @@ async def create_issue(self, ctx: commands.Context[commands.Bot], title: str, bo
     )
     @commands.guild_only()
     @checks.has_pl(8)
-    async def get_issue(self, ctx: commands.Context[commands.Bot], issue_number: int) -> None:
+    async def get_issue(self, ctx: commands.Context[Tux], issue_number: int) -> None:
         """
         Get an issue by issue number.
 
         Parameters
         ----------
-        ctx : commands.Context[commands.Bot]
+        ctx : commands.Context[Tux]
             The context object for the command.
         issue_number : int
             The number of the issue to retrieve.
@@ -542,5 +544,5 @@ async def get_issue(self, ctx: commands.Context[commands.Bot], issue_number: int
             logger.info(f"{ctx.author} fetched an issue.")
 
 
-async def setup(bot: commands.Bot) -> None:
+async def setup(bot: Tux) -> None:
     await bot.add_cog(Git(bot))

tux/cogs/admin/mail.py

@@ -6,14 +6,15 @@
 from discord.ext import commands
 from loguru import logger
 
+from tux.bot import Tux
 from tux.utils import checks
 from tux.utils.constants import Constants as CONST
 
 MailboxData = dict[str, str | list[str]]
 
 
 class Mail(commands.Cog):
-    def __init__(self, bot: commands.Bot) -> None:
+    def __init__(self, bot: Tux) -> None:
         self.bot = bot
         self.api_url = CONST.MAILCOW_API_URL
         self.headers = {
@@ -203,5 +204,5 @@ async def _send_dm(
             )
 
 
-async def setup(bot: commands.Bot) -> None:
+async def setup(bot: Tux) -> None:
     await bot.add_cog(Mail(bot))

tux/cogs/fun/fact.py

@@ -2,11 +2,12 @@
 
 from discord.ext import commands
 
+from tux.bot import Tux
 from tux.utils.embeds import EmbedCreator
 
 
 class Fact(commands.Cog):
-    def __init__(self, bot: commands.Bot) -> None:
+    def __init__(self, bot: Tux) -> None:
         self.bot = bot
         self.facts = [
             "The Linux kernel has over 36 million lines of code in its Git repository.",
@@ -36,13 +37,13 @@ def __init__(self, bot: commands.Bot) -> None:
         name="fact",
         aliases=["funfact"],
     )
-    async def fact(self, ctx: commands.Context[commands.Bot]) -> None:
+    async def fact(self, ctx: commands.Context[Tux]) -> None:
         """
         Get a random fun fact.
 
         Parameters
         ----------
-        ctx : commands.Context[commands.Bot]
+        ctx : commands.Context[Tux]
             The context object for the command.
         """
         embed = EmbedCreator.create_info_embed(
@@ -61,5 +62,5 @@ async def fact(self, ctx: commands.Context[commands.Bot]) -> None:
         await ctx.send(embed=embed)
 
 
-async def setup(bot: commands.Bot) -> None:
+async def setup(bot: Tux) -> None:
     await bot.add_cog(Fact(bot))

tux/cogs/fun/imgeffect.py

@@ -7,11 +7,12 @@
 from loguru import logger
 from PIL import Image, ImageEnhance, ImageOps
 
+from tux.bot import Tux
 from tux.utils.embeds import EmbedCreator
 
 
 class ImgEffect(commands.Cog):
-    def __init__(self, bot: commands.Bot) -> None:
+    def __init__(self, bot: Tux) -> None:
         self.bot = bot
         self.allowed_mimetypes = [
             "image/jpeg",
@@ -93,5 +94,5 @@ async def deepfry(self, interaction: discord.Interaction, image: discord.Attachm
         await interaction.followup.send(file=file, ephemeral=True)
 
 
-async def setup(bot: commands.Bot) -> None:
+async def setup(bot: Tux) -> None:
     await bot.add_cog(ImgEffect(bot))