Added donate cmd, improved help cmd, & other imrpv. hlA~

Author: Ambratolm

bot/cogs/act_cog.py

@@ -7,9 +7,13 @@
 from tabulate import tabulate
 
 from bot.main import ActBot
+from bot.ui import EmbedX
 from db.actor import Actor
 
 
+# ----------------------------------------------------------------------------------------------------
+# * Board Cog
+# ----------------------------------------------------------------------------------------------------
 class Board(Cog, description="Allows players to view their data."):
     def __init__(self, bot: ActBot):
         self.bot = bot
@@ -23,10 +27,7 @@ async def profile(
     ):
         await interaction.response.defer()
         member = member or interaction.user
-        embed = Embed(
-            title=f"👤 {member.display_name}",
-            color=Color.blue(),
-        )
+        embed = EmbedX.info(icon="👤", title=member.display_name)
         if isinstance(member, Member):
             embed.description = " ".join(
                 [
@@ -36,7 +37,7 @@ async def profile(
                 ]
             )
         db = self.bot.get_db(interaction.guild)
-        actor = db.find_one(Actor, Actor.id == member.id) if db else None
+        actor = db.find_one(Actor, Actor.id == member.id)
         if not actor:
             actor = self.bot.create_actor(member)
         embed.add_field(name="", value="", inline=False)
@@ -75,19 +76,15 @@ async def leaderboard(self, interaction: Interaction):
         # Get top actors
         await interaction.response.defer()
         db = self.bot.get_db(interaction.guild)
-        actors = (
-            db.find(
-                Actor,
-                sort=(
-                    query.desc(Actor.rank),
-                    query.desc(Actor.level),
-                    query.desc(Actor.xp),
-                    query.desc(Actor.gold),
-                ),
-                limit=10,
-            )
-            if db
-            else None
+        actors = db.find(
+            Actor,
+            sort=(
+                query.desc(Actor.rank),
+                query.desc(Actor.level),
+                query.desc(Actor.xp),
+                query.desc(Actor.gold),
+            ),
+            limit=10,
         )
         if not actors:
             await interaction.followup.send(
@@ -114,7 +111,7 @@ async def leaderboard(self, interaction: Interaction):
         leaderboard_text += "```"
 
         # Create embed
-        embed = Embed(title="🏆 Leaderboard", color=Color.blue())
+        embed = EmbedX.info(icon="🏆", title="Leaderboard")
         try:
             top_member = guild.get_member(top_actor.id) or await guild.fetch_member(
                 top_actor.id
@@ -125,4 +122,3 @@ async def leaderboard(self, interaction: Interaction):
             pass
         embed.add_field(name="", value=leaderboard_text, inline=False)
         await interaction.followup.send(embed=embed)
-        await interaction.followup.send(embed=embed)

bot/cogs/board_cog.py

@@ -0,0 +1,31 @@
+import argparse
+import shlex
+
+from discord import Color, Embed, Interaction, Member, Message, app_commands
+from discord.ext import commands
+from discord.ext.commands import Cog, GroupCog
+from tabulate import tabulate
+
+from bot.main import ActBot
+from bot.ui import EmbedX
+from db.actor import Actor
+
+
+# ----------------------------------------------------------------------------------------------------
+# * Console Cog
+# ----------------------------------------------------------------------------------------------------
+class Console(Cog, description="Provides control and management interface."):
+    def __init__(self, bot: ActBot):
+        self.bot = bot
+
+    @app_commands.checks.has_permissions(administrator=True)
+    @app_commands.command(description="Synchronize commands")
+    async def sync(self, interaction: Interaction):
+        count = await self.bot.sync_commands()
+        await interaction.response.send_message(
+            embed=EmbedX.success(
+                title="Commands Synchronization",
+                description=f"{count[0]}/{count[1]} commands synchronized.",
+            ),
+            ephemeral=True,
+        )

bot/cogs/console_cog.py

@@ -1,24 +1,17 @@
-import asyncio
-import random
 import re
+from random import randint
 
-from discord import (
-    Color,
-    Embed,
-    Member,
-    Message,
-    Permissions,
-    Role,
-    TextChannel,
-    User,
-    utils,
-)
-from discord.ext.commands import Bot, Cog
+from discord import Color, Embed, Member, Message, Role, utils
+from discord.ext.commands import Cog
 
 from bot.main import ActBot
+from bot.ui import EmbedX
 from db.actor import Actor
 
 
+# ----------------------------------------------------------------------------------------------------
+# * Farm Cog
+# ----------------------------------------------------------------------------------------------------
 class Farm(Cog, description="Allows players to gain stats and roles."):
     def __init__(self, bot: ActBot):
         self.bot = bot
@@ -32,8 +25,6 @@ async def on_message(self, message: Message):
 
         # Get or create actor
         db = self.bot.get_db(message.guild)
-        if not db:
-            return
         actor = db.find_one(Actor, Actor.id == member.id)
         if not actor:
             actor = self.bot.create_actor(member)
@@ -55,12 +46,12 @@ async def on_message(self, message: Message):
 
         # Try level-up
         if actor.try_level_up():
-            gold_reward = random.randint(1, 500) * actor.level
+            gold_reward = randint(1, 500) * actor.level
             actor.gold += gold_reward
-            embed = Embed(
-                title=f"🏅 Level Up",
+            embed = EmbedX.success(
+                icon="🏅",
+                title="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}**")
@@ -72,12 +63,12 @@ async def on_message(self, message: Message):
         if actor.try_rank_up():
             # awarded_role = await self.award_role(member, actor.rank_name)
             # if awarded_role:
-            gold_reward = random.randint(1, 1000) * actor.level
+            gold_reward = randint(1, 1000) * actor.level
             actor.gold += gold_reward
-            embed = Embed(
-                title=f"🏆 Rank Up",
+            embed = EmbedX.success(
+                icon="🏆",
+                title="Rank Up",
                 description=f"{member.display_name} {member.mention} has reached a new rank and has been rewarded.",
-                color=Color.green(),
             )
             embed.add_field(name="", value="", inline=False)
             embed.add_field(name="Rank ✨", value=f"🏆 **{actor.rank_name}**")
@@ -108,7 +99,7 @@ def calculate_xp_reward(message: Message):
         # Minimum word count (to avoid 0 XP rewards)
         word_count = max(1, word_count)  # Ensure at least 1 word is counted
 
-        return random.randint(1, word_count)
+        return randint(1, word_count)
 
     @staticmethod
     async def try_award_role(member: Member, role_name: str) -> Role | None:

bot/cogs/farm_cog.py

@@ -6,6 +6,7 @@
 from profanity_check import predict_prob
 
 from bot.main import ActBot
+from bot.ui import EmbedX
 from db.actor import Actor
 from utils.log import logger
 
@@ -43,11 +44,7 @@ async def on_message(self, message: Message):
 
         # Delete & replace message
         await message.delete()
-        embed = Embed(
-            title="",
-            description=censored_content,
-            color=Color.red(),
-        )
+        embed = EmbedX.error(censored_content, "", "")
         embed.add_field(name="", value="")
         embed.set_author(name=member.display_name, icon_url=member.avatar)
         embed.set_footer(text="🚫 Censored Message")
@@ -62,8 +59,6 @@ async def on_message(self, message: Message):
 
         # Penalize by gold
         db = self.bot.get_db(message.guild)
-        if not db:
-            return
         actor = db.find_one(Actor, Actor.id == member.id)
         if not actor:
             actor = self.bot.create_actor(member)
@@ -82,10 +77,10 @@ async def on_message(self, message: Message):
             await member.timeout(time, reason="Filter")
 
         # Notice
-        embed = Embed(
-            title=f"🚨 Penalty",
+        embed = EmbedX.error(
+            icon="🚨",
+            title="Penalty",
             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)
         embed.add_field(name="Gold 🔻", value=f"💰 **-{self.GOLD_PENALTY}**")

bot/cogs/filter_cog.py

@@ -0,0 +1,88 @@
+from random import randint
+
+from discord import Interaction, Member, app_commands
+from discord.ext.commands import Cog
+
+from bot.main import ActBot
+from bot.ui import EmbedX
+from db.actor import Actor
+
+
+# ----------------------------------------------------------------------------------------------------
+# * Gift Cog
+# ----------------------------------------------------------------------------------------------------
+class Gift(Cog, description="Allows players to gift eachother."):
+    def __init__(self, bot: ActBot):
+        self.bot = bot
+
+    @app_commands.guild_only()
+    @app_commands.command(description="Give your gold to another member")
+    async def donate(self, interaction: Interaction, member: Member, gold: int):
+        await interaction.response.defer(ephemeral=True)
+
+        # Validate input
+        if gold <= 0:
+            await interaction.followup.send(
+                embed=EmbedX.error(
+                    f"Your gold input value of **{gold}** is invalid.\nDid you mean **{-gold if gold else randint(1, 1000)}** ?"
+                )
+            )
+            return
+
+        # Retrieve donor user
+        db = self.bot.get_db(interaction.guild)
+        donor_member = interaction.user
+        donor_actor = db.find_one(Actor, Actor.id == donor_member.id)
+        if not donor_actor:
+            await interaction.followup.send(
+                embed=EmbedX.error(f"There seems to be a problem from your side.")
+            )
+            return
+
+        # Retrieve recipient user
+        recipient_member = member
+        recipient_actor = db.find_one(Actor, Actor.id == recipient_member.id)
+        if not recipient_actor:
+            await interaction.followup.send(
+                embed=EmbedX.error(
+                    f"There seems to be a problem from the side of {recipient_member.mention}."
+                )
+            )
+            return
+
+        # Check if user is trying to donate to themselves
+        if donor_member == recipient_member:
+            await interaction.followup.send(
+                embed=EmbedX.warning(f"You can't donate to yourself.")
+            )
+            return
+
+        # Chek if donor has the gold
+        if donor_actor.gold < gold:
+            await interaction.followup.send(
+                embed=EmbedX.warning(
+                    f"You don't have enough to donate **💰 {gold} Gold**.\nYou have **💰 {donor_actor.gold} Gold**."
+                )
+            )
+            return
+
+        # Add gold and update user data
+        donor_actor.gold = max(0, donor_actor.gold - gold)
+        recipient_actor.gold += gold
+        db.save_all([donor_actor, recipient_actor])
+
+        # Create the response embed
+        embed = EmbedX.success(
+            icon="💛",
+            title="Gold Donation",
+            description=(
+                f"{recipient_member.display_name} {recipient_member.mention} has received **💰 {gold} Gold** from {donor_member.display_name} {donor_member.mention}."
+            ),
+        )
+        embed.set_author(
+            name=donor_member.display_name, icon_url=donor_member.display_avatar
+        )
+        embed.set_thumbnail(url=recipient_member.display_avatar)
+
+        # Respond with confirmation
+        await interaction.followup.send(embed=embed)