Fixed leaderboard & actions workflow

Author: Ambratolm

.github/workflows/deploy.yml

@@ -19,8 +19,10 @@ jobs:
           host: ${{ secrets.EC2_HOST }}
           username: ${{ secrets.EC2_USER }}
           key: ${{ secrets.EC2_SSH_KEY }}
+          command_timeout: "20m"
           script: |
-            pkill -f "uv"
-            cd /home/ubuntu/TACT/
+            cd /home/ubuntu/ACT/
             git pull fork ft-rework
-            nohup uv run task app-prod &
+            sudo systemctl restart act-app.service
+            sleep 3
+            sudo systemctl status act-app.service --no-pager

bot/cogs/act_cog.py

@@ -1,12 +1,21 @@
 import discord
 from colorama import Fore
-from discord import Color, Embed, Guild, Interaction, Message, Status, app_commands
+from discord import (
+    Color,
+    Embed,
+    Guild,
+    Interaction,
+    Message,
+    Permissions,
+    Status,
+    app_commands,
+)
 from discord.ext import commands
 from discord.ext.commands import Bot, Cog, GroupCog
+from humanize import naturaltime
 from pymongo.database import Database
 
 from bot.main import ActBot
-from bot.ui import EmbedX
 from db.main import ActDb
 from utils.log import logger
 from utils.misc import import_classes, text_block
@@ -26,6 +35,22 @@ def __init__(self, bot: ActBot):
     async def hi(self, interaction: Interaction):
         await interaction.response.send_message("Hello 🙋‍♀️")
 
-    @app_commands.command(description="Its cat wow!")
-    async def cat(self, interaction: Interaction):
-        await interaction.response.send_message("Meow! 🐱")
+    @app_commands.guild_only
+    @app_commands.command(description="Show all roles")
+    async def roles(self, interaction: Interaction):
+        await interaction.response.defer()
+        guild = interaction.guild
+        roles = (
+            sorted(guild.roles, key=lambda role: role.position, reverse=True)
+            if guild
+            else []
+        )
+        embed = Embed(title="🎭 Roles", color=Color.blue())
+        embed.add_field(name="", value="", inline=False)
+        for role in roles:
+            embed.add_field(name="", value="", inline=False)
+            embed.add_field(name=role.name, value="")
+            embed.add_field(name=f"👥 {len(role.members)}", value="")
+        if not len(embed.fields):
+            embed.description = "_No roles found in this server._"
+        await interaction.followup.send(embed=embed)

bot/cogs/board.py

@@ -1,13 +1,11 @@
 import asyncio
 
 from discord import Color, Embed, Interaction, Member, User, app_commands
-from discord.app_commands import command, guild_only
 from discord.ext.commands import Cog
 from humanize import naturaltime
-from odmantic import AIOEngine, Model, query
+from odmantic import query
 
 from bot.main import ActBot
-from bot.ui import EmbedX
 from db.actor import Actor
 
 
@@ -16,7 +14,9 @@ def __init__(self, bot: ActBot):
         self.bot = bot
 
     @app_commands.guild_only()
-    @app_commands.command(description="Get your or another member's information")
+    @app_commands.command(
+        description="View your or another member's profile information"
+    )
     async def profile(
         self, interaction: Interaction, member: Member | User | None = None
     ):
@@ -57,7 +57,7 @@ async def profile(
         await interaction.followup.send(embed=embed)
 
     @app_commands.guild_only()
-    @app_commands.command(description="View leaderboard")
+    @app_commands.command(description="View top members")
     async def leaderboard(self, interaction: Interaction):
         # Check guild (not needed but just for type-checking)
         guild = interaction.guild
@@ -82,56 +82,26 @@ async def leaderboard(self, interaction: Interaction):
         )
         if not actors:
             await interaction.followup.send(
-                embed=EmbedX.info("", "No members found for the leaderboard.")
+                embed=Embed(
+                    title="❔",
+                    description="No members found.",
+                    color=Color.yellow(),
+                )
             )
             return
 
-        # Get associated members
-        members = []
-        for actor in actors:
-            member = guild.get_member(actor.id)  # Try get from cache
-            if member:
-                members.append(member)
-            else:
-                members.append(None)  # placeholder to fetch later concurrently
-
-        # Fetch missing members concurrently
-        members_futures = [
-            guild.fetch_member(actor.id)
-            for i, actor in enumerate(actors)
-            if members[i] is None
-        ]
-        try:
-            fetched_members = await asyncio.gather(*members_futures)
-        except Exception as e:
-            await interaction.followup.send(
-                embed=EmbedX.error(description="Could not fetch members.")
-            )
-            return
-
-        # Update members list with fetched members
-        fetched_index = 0
-        for i, actor in enumerate(actors):
-            if members[i] is None:
-                members[i] = fetched_members[fetched_index]
-                fetched_index += 1
-
-        # Create embed
+        # Create embed while fetching memebrs associated with actors
         embed = Embed(title="🏆 Leaderboard", color=Color.blue())
         for i, actor in enumerate(actors):
-            member = members[i]
-            member_name = member.display_name if member else f"{actor.display_name} (⚠)"
-            embed.add_field(
-                name="",
-                value=10 * "➖",
-                inline=False,
-            )
+            separator = 10 * "‎ "
+            embed.add_field(name="", value="", inline=False)
             embed.add_field(
-                name=f"**{i + 1}** ✨ {member_name}",
-                value=f" ",
+                name=f"# **{i + 1}** {separator} {actor.display_name}",
+                value=f"",
             )
+            embed.add_field(name="", value="")
             embed.add_field(
-                name=f"🏅 {actor.level} ⏫ {actor.xp} 💰 {actor.gold}",
-                value="",
+                name=f"",
+                value=f"-# 🏅 {actor.level} {separator} ⏫ {actor.xp} {separator} 💰 {actor.gold}",
             )
         await interaction.followup.send(embed=embed)

bot/cogs/farm.py

@@ -2,7 +2,7 @@
 import random
 import re
 
-from discord import Member, Message, TextChannel, User, utils
+from discord import Color, Embed, Member, Message, TextChannel, User, utils
 from discord.ext.commands import Bot, Cog
 
 from bot.main import ActBot
@@ -47,9 +47,16 @@ async def on_message(self, message: Message):
         if actor.try_level_up():
             gold_reward = random.randint(1, 500) * actor.level
             actor.gold += gold_reward
-            await message.channel.send(
-                f"🎉 {member.mention}! You have reached **🏅 Level {actor.level}** and earned **💰 {gold_reward} Gold**."
+            embed = Embed(
+                title=f"🎉 Level Up",
+                description=f"{member.display_name} {member.mention} has reached a new level and has been rewarded.",
+                color=Color.green(),
             )
+            embed.add_field(name="", value="", inline=False)
+            embed.add_field(name="Level", value=f"🏅 **{actor.level}**")
+            embed.add_field(name="Gold 🔼", value=f"💰 **+{gold_reward}**")
+            embed.set_thumbnail(url=member.display_avatar.url)
+            await message.channel.send(embed=embed)
 
         # Try role-up
         awarded_role = await self.award_role(member, actor.rank_name)

bot/cogs/filter_cog.py

@@ -83,7 +83,7 @@ async def on_message(self, message: Message):
         # Notice
         embed = Embed(
             title=f"🚨 Penalty",
-            description=f"{member.display_name} ({member.mention}) has been penalized for repeated use of offensive language.",
+            description=f"{member.display_name} {member.mention} has been penalized for repeated use of offensive language.",
             color=Color.red(),
         )
         embed.add_field(name="", value="", inline=False)

bot/cogs/test_cog.py

@@ -1,9 +1,8 @@
-from discord import Interaction, Message, app_commands
+from discord import Color, Embed, Interaction, Message, app_commands
 from discord.ext import commands
 from discord.ext.commands import Cog
 
 from bot.main import ActBot
-from bot.ui import EmbedX
 
 
 # ----------------------------------------------------------------------------------------------------
@@ -18,8 +17,10 @@ def __init__(self, bot: ActBot):
     async def sync(self, interaction: Interaction):
         count = await self.bot.sync_commands()
         await interaction.response.send_message(
-            embed=EmbedX.success(
-                "Commands Sync", f"{count[0]}/{count[1]} commands synced."
+            embed=Embed(
+                title="Commands Sync",
+                description=f"{count[0]}/{count[1]} commands synced.",
+                color=Color.green(),
             )
         )
 
@@ -28,7 +29,9 @@ async def sync_error(
         self, interaction: Interaction, error: app_commands.AppCommandError
     ):
         await interaction.response.send_message(
-            embed=EmbedX.error("Commands Sync", f"{error}.")
+            embed=Embed(
+                title="Commands Sync", description=f"{error}.", color=Color.red()
+            )
         )
 
     # ----------------------------------------------------------------------------------------------------

bot/main.py

@@ -1,11 +1,20 @@
 import pathlib
 
 from colorama import Fore
-from discord import Guild, Interaction, Member, Message, User, VoiceClient, app_commands
+from discord import (
+    Color,
+    Embed,
+    Guild,
+    Interaction,
+    Member,
+    Message,
+    User,
+    VoiceClient,
+    app_commands,
+)
 from discord.ext.commands import Bot, Cog
 from odmantic import SyncEngine
 
-from bot.ui import EmbedX
 from db.actor import Actor
 from db.main import ActDb, DbRef
 from utils.log import logger
@@ -48,10 +57,10 @@ async def setup_hook(self):
     @Cog.listener()
     async def on_ready(self):
         log.success(f"🎮 Bot client connected as {self.user}.")
-        log.info("\n" + self.cogs_info_text)
+        # log.info("\n" + self.cogs_info_text)
         log.info("\n" + self.app_commands_info_text)
-        log.info("\n" + await self.app_commands_remote_info_text)
-        log.info("\n" + self.commands_info_text)
+        # log.info("\n" + await self.app_commands_remote_info_text)
+        # log.info("\n" + self.commands_info_text)
         # await self.sync_commands()
 
     @Cog.listener()
@@ -62,7 +71,9 @@ async def on_message(self, message: Message):
     async def on_error(
         self, interaction: Interaction, error: app_commands.AppCommandError
     ):
-        await interaction.response.send_message(embed=EmbedX.error("Error", f"{error}"))
+        await interaction.response.send_message(
+            embed=Embed(title="⛔ Error", description=f"{error}.", color=Color.red())
+        )
 
     # ----------------------------------------------------------------------------------------------------
 

bot/ui.py

@@ -94,7 +94,7 @@ def try_rank_up(self) -> bool:
 
     @property
     def level_bar(self) -> str:
-        return text_progress_bar(self.level, self.MAX_LEVEL, 5, "⭐", "☆")
+        return text_progress_bar(self.level, self.next_rank_level, 5, "⭐", "☆")
 
     @property
     def xp_bar(self) -> str: