Simplify Shinobu cog init

Author: greeeen-dev

shinobu/runtime/models/shinobu_cog.py

@@ -27,21 +27,12 @@ def visible_in_help(self) -> bool:
         return self._visible_in_help
 
 class ShinobuCog(commands.Cog):
-    def __init__(self, bot):
+    def __init__(self, bot, shinobu_metadata: ShinobuCogMetadata | None = None):
         self.bot: bridge.Bot = bot
-        self._shinobu_metadata: ShinobuCogMetadata | None = None
+        self._shinobu_metadata: ShinobuCogMetadata | None = shinobu_metadata
         self._shinobu_secrets: fine_grained.FineGrainedSecrets | None = None
         self._shinobu_files: fine_grained.FineGrainedSecureFiles | None = None
 
-    def setup_shinobu_cog(self, bot, **kwargs):
-        self.bot = bot
-        self._shinobu_secrets: fine_grained.FineGrainedSecrets | None = None
-        self._shinobu_files: fine_grained.FineGrainedSecureFiles | None = None
-
-        # Get secure files wrapper if it exists
-        if "files_wrapper" in kwargs:
-            self._shinobu_files = kwargs.get("files_wrapper")
-
     def issue_entitlements(self, secrets: fine_grained.FineGrainedSecrets | None = None,
                            files: fine_grained.FineGrainedSecureFiles | None = None):
         """Issues entitlements to a Shinobu cog."""

shinobu/runtime/modules/admin.py

@@ -19,11 +19,9 @@ def is_owner(ctx):
     return ctx.message.author.id == 356456393491873795
 
 class Admin(shinobu_cog.ShinobuCog):
-    def __init__(self, bot, **kwargs):
-        # Register cog metadata
-        self.setup_shinobu_cog(
+    def __init__(self, bot):
+        super().__init__(
             bot,
-            **kwargs,
             shinobu_metadata=shinobu_cog.ShinobuCogMetadata(
                 name="Admin",
                 description="Admin commands",

shinobu/runtime/modules/events.py

@@ -4,10 +4,8 @@
 
 class ShinobuEvents(shinobu_cog.ShinobuCog):
     def __init__(self, bot, **kwargs):
-        # Register cog metadata
-        self.setup_shinobu_cog(
+        super().__init__(
             bot,
-            **kwargs,
             shinobu_metadata=shinobu_cog.ShinobuCogMetadata(
                 name="Events",
                 description="A cog handling Shinobu bot events.",