Improved ALeaderboardcog: Adivided into rank/level subs & improv

Author: Ambratolm

bot/cogs/game_cogs/leaderboard_cog.py

@@ -1,5 +1,7 @@
+from typing import Any
+
 from discord import Color, Embed, Guild, Interaction, Member, User, app_commands
-from discord.ext.commands import Cog
+from discord.ext.commands import GroupCog
 from humanize import intcomma, naturalsize, naturaltime
 from odmantic import query
 
@@ -11,15 +13,49 @@
 # ----------------------------------------------------------------------------------------------------
 # * Leaderboard Cog
 # ----------------------------------------------------------------------------------------------------
-class LeaderboardCog(Cog, description="Allows players to view their data"):
+class LeaderboardCog(
+    GroupCog, group_name="leaderboard", description="Allows players to view their data"
+):
     def __init__(self, bot: ActBot):
         self.bot = bot
 
     # ----------------------------------------------------------------------------------------------------
 
     @app_commands.guild_only()
-    @app_commands.command(description="View top members")
-    async def leaderboard(self, interaction: Interaction):
+    @app_commands.command(description="View top members sorted by level")
+    async def level(self, interaction: Interaction):
+        embed = EmbedX.info(emoji="🏅", title="Level Leaderboard")
+        await self.show_leaderboard(
+            interaction=interaction,
+            embed=embed,
+            sort=(
+                query.desc(Actor.level),
+                query.desc(Actor.xp),
+                query.desc(Actor.gold),
+            ),
+        )
+
+    @app_commands.guild_only()
+    @app_commands.command(description="View top members sorted by rank")
+    async def rank(self, interaction: Interaction):
+        embed = EmbedX.info(emoji="🏆", title="Rank Leaderboard")
+        await self.show_leaderboard(
+            interaction=interaction,
+            embed=embed,
+            sort=(
+                query.desc(Actor.elo),
+                query.desc(Actor.gold),
+            ),
+        )
+
+    # ----------------------------------------------------------------------------------------------------
+
+    async def show_leaderboard(
+        self,
+        interaction: Interaction,
+        embed: Embed,
+        sort: Any,
+    ):
         # Check guild
         guild = interaction.guild
         if not guild:
@@ -31,15 +67,15 @@ async def leaderboard(self, interaction: Interaction):
 
         # Get top actors
         await interaction.response.defer()
-        actors_members = await self.bot.get_actors_members(guild)
+        actors_members = await self.bot.get_actors_members(guild=guild, sort=sort)
         if not actors_members:
             await interaction.followup.send(
                 embed=EmbedX.warning(description="No actors found.")
             )
             return
 
         # Create board table
-        top_actor: Actor
+        # top_actor: Actor
         names_column_text = ""
         stats_column_text = ""
         for i, (actor, member) in enumerate(actors_members):
@@ -55,8 +91,7 @@ async def leaderboard(self, interaction: Interaction):
             names_column_text += f"**# {(i+1)}** ― {medal} {name} {skull}\n**`🏆{rank} 🏅{level} ⏫{xp} 💰{gold}`**\n\n"
             # stats_column_text += f"**`🏆{rank} 🏅{level} ⏫{xp} 💰{gold}`**\n"
 
-        # Create embed
-        embed = EmbedX.info(emoji="🏆", title="Leaderboard")
+        # Send embed
         # try:
         #     top_member = guild.get_member(top_actor.id) or await guild.fetch_member(
         #         top_actor.id

bot/main.py

@@ -1,4 +1,5 @@
 import pathlib
+from typing import Any
 
 from colorama import Fore
 from discord import Guild, Interaction, Member, Message, Object, User, app_commands
@@ -211,23 +212,25 @@ def create_dm_actor(self, user: User) -> DmActor:
     # ----------------------------------------------------------------------------------------------------
 
     async def get_actors_members(
-        self, guild: Guild, limit: int = 10, sort_by_top=True
+        self,
+        guild: Guild,
+        limit: int = 10,
+        sort: Any | None = (
+            query.desc(Actor.level),
+            query.desc(Actor.xp),
+            query.desc(Actor.gold),
+        ),
     ) -> list[tuple[Actor, Member]]:
         """Get actors with their associated members."""
         db = self.get_db(guild)
         actors = (
             db.find(
                 Actor,
                 Actor.is_member == True,
-                sort=(
-                    query.desc(Actor.elo),
-                    query.desc(Actor.level),
-                    query.desc(Actor.xp),
-                    query.desc(Actor.gold),
-                ),
+                sort=sort,
                 limit=limit,
             )
-            if sort_by_top
+            if sort
             else db.find(Actor, limit=limit)
         )
         actors_members: list[tuple[Actor, Member]] = []