Merge branch 'dev' into player-context

cogs/information.py

@@ -13,15 +13,13 @@ from bot import ChristmasBot
 from context import CustomContext
 from utils.database import AutoJoin
 from utils.EmbedGenerator import EmbedGenerator
+from utils.classes import BaseCog
 from utils.paginator import HelpPaginator
 
 
-class InformationCog(commands.Cog, name="Information"):
-    def __init__(self, bot: ChristmasBot):
-        self.bot = bot
-
+class InformationCog(BaseCog, name="Information"):
+    @commands.command(name="ping", aliases=["pong"])
     @commands.cooldown(rate=1, per=5, type=commands.BucketType.user)
-    @commands.command(description="PONG!", aliases=["pong"])
     async def ping(self, ctx: Context):
         """Test the latency"""
         avatar = ctx.author.avatar.with_static_format("jpeg")
@@ -42,25 +40,19 @@ class InformationCog(commands.Cog, name="Information"):
         embed.set_footer(text=f"Requested by: {ctx.author}", icon_url=f"{avatar}")
         await msg.edit(embed=embed)
 
-    @commands.command(
-        name="invite", description="Gets the invite link!", slash_commands=True
-    )
+    @commands.command(name="invite")
     @commands.cooldown(rate=1, per=5, type=commands.BucketType.user)
     async def invite(self, ctx: Context):
-        """Gets the invite link!"""
+        """Gets the invite link"""
         await EmbedGenerator.Message(
             ctx, "Add our bot to your server:", self.bot.invite_link
         )
 
-    @commands.command(
-        name="wlinfo",
-        description="Retrieve various Node/Server/Player information.",
-        slash_commands=True,
-    )
+    @commands.command(name="wlinfo")
     @commands.cooldown(rate=1, per=5, type=commands.BucketType.user)
     async def wlinfo(self, ctx: CustomContext):
-        """Retrieve various Node/Server/Player information."""
-        player = ctx.get_player()
+        """Retrieve various node/server/player information"""
+        player = self.bot.lavalink.player_manager.get(ctx.guild.id)
         node = player.node
 
         used = humanize.naturalsize(node.stats.memory_used)
@@ -80,10 +72,9 @@ class InformationCog(commands.Cog, name="Information"):
             f"Server Uptime: `{datetime.timedelta(milliseconds=node.stats.uptime)}`"
         )
         await ctx.send(fmt)
-
         AutoJoin.get_channels()
 
-    @commands.command(name="help", aliases=["about", "info"], slash_command=True)
+    @commands.command(name="help", aliases=["about", "info"])
     @commands.cooldown(1, 1, commands.BucketType.user)
     async def about(
         self,
@@ -92,7 +83,7 @@ class InformationCog(commands.Cog, name="Information"):
             description="Show help for a command or category"
         ),
     ):
-        """ChristmasBot command list"""
+        """Retrieve a list of possible commands"""
         if command:
             entity = self.bot.get_cog(command) or self.bot.get_command(command)