Implemented buy/bag commands & minor improvments

Author: Ambratolm

bot/cogs/chat_cogs/ai_cog.py

@@ -27,7 +27,7 @@
 # ----------------------------------------------------------------------------------------------------
 # * AI Cog
 # ----------------------------------------------------------------------------------------------------
-class AiCog(Cog, description="Integrated generative AI chat bot."):
+class AiCog(Cog, description="Integrated generative AI chat bot"):
     CONFIG_PATH = Path(__file__).parent / "ai_cog.toml"
     MAX_ACTORS = 10
     COOLDOWN_TIME = 60  # 1 min

bot/cogs/chat_cogs/filter_cog.py

@@ -3,6 +3,7 @@
 
 from discord import Member, Message
 from discord.ext.commands import Cog
+from humanize import naturaltime, precisedelta
 from profanity_check import predict_prob
 
 from bot.main import ActBot
@@ -16,9 +17,9 @@
 # ----------------------------------------------------------------------------------------------------
 # * Filter Cog
 # ----------------------------------------------------------------------------------------------------
-class FilterCog(Cog, description="Filters blacklisted message content."):
+class FilterCog(Cog, description="Filter blacklisted message content."):
     TOLERANCE = 0.99  # 99 %
-    MAX_OFFENSES = 5
+    MAX_OFFENSES = 1
     GOLD_PENALTY = 500
 
     def __init__(self, bot: ActBot):
@@ -54,8 +55,6 @@ async def on_message(self, message: Message):
         censored_message = await message.channel.send(embed=embed)
 
         # Accumulate offenses to detect abuse
-        if member.guild_permissions.administrator:
-            return
         self.offenses[member.id] += 1
         if self.offenses[member.id] < FilterCog.MAX_OFFENSES:
             return
@@ -75,22 +74,23 @@ async def on_message(self, message: Message):
         self.offenses[member.id] = 0
 
         # Penalize by timeout (if insufficient gold)
+        time = 0
         if debt_gold:
             time = timedelta(seconds=int(0.5 * debt_gold))  # 0.5 seconds per gold
-            await member.timeout(time, reason="Filter")
+            if not member.guild_permissions.administrator:
+                await member.timeout(time, reason="Repeated use of offensive language")
 
         # Notice
         embed = EmbedX.error(
             emoji="🚨",
             title="Penalty",
             description=f"{member.mention} has been penalized for repeated use of offensive language.",
         )
-        embed.add_field(name="", value="", inline=False)
         embed.add_field(name="Gold 🔻", value=f"💰 **-{self.GOLD_PENALTY}**")
         if debt_gold:
             embed.add_field(
-                name=f"Timeout Activated ❗",
-                value=f"⏳ **{time}**\n💰 **{debt_gold}** _Debt Converted_",
+                name=f"Timeout",
+                value=f"⏳ **{precisedelta(time)}**\n-# **💰 {debt_gold}** Debt Converted",
             )
         embed.set_thumbnail(url=member.display_avatar.url)
         await censored_message.reply(

bot/cogs/console_cog.py

@@ -9,7 +9,7 @@
 # ----------------------------------------------------------------------------------------------------
 # * Console Cog
 # ----------------------------------------------------------------------------------------------------
-class ConsoleCog(Cog, description="Provides control and management interface."):
+class ConsoleCog(Cog, description="Provide control and management interface"):
     def __init__(self, bot: ActBot):
         self.bot = bot
 

bot/cogs/game_cogs/combat_cog.py

@@ -24,7 +24,7 @@ def add_preview_notice(embed: Embed):
 # ----------------------------------------------------------------------------------------------------
 # * Combat Cog
 # ----------------------------------------------------------------------------------------------------
-class CombatCog(Cog, description="Allows players to engage in battles."):
+class CombatCog(Cog, description="Allow players to engage in battles"):
     def __init__(self, bot: ActBot):
         self.bot = bot
 

bot/cogs/game_cogs/exchange_cog.py

@@ -1,17 +1,19 @@
 from random import randint
 
 from discord import Interaction, Member, app_commands
+from discord.abc import Messageable
 from discord.ext.commands import Cog
 
 from bot.main import ActBot
 from bot.ui import EmbedX
 from db.actor import Actor
+from utils.misc import numsign
 
 
 # ----------------------------------------------------------------------------------------------------
 # * Exchange Cog
 # ----------------------------------------------------------------------------------------------------
-class ExchangeCog(Cog, description="Allows players to exchange gold and goods."):
+class ExchangeCog(Cog, description="Allow players to exchange gold and goods"):
     def __init__(self, bot: ActBot):
         self.bot = bot
 
@@ -21,24 +23,26 @@ def __init__(self, bot: ActBot):
     @app_commands.guild_only()
     @app_commands.command(description="Give your gold to another member")
     @app_commands.describe(
-        member="Member to donate gold to", gold="Amount of gold to donate"
+        member="Recipient member to send gold to", gold="Amount of gold to donate"
     )
     async def donate(self, interaction: Interaction, member: Member, gold: int):
         # Validate input
         if gold <= 0:
             await interaction.response.send_message(
                 embed=EmbedX.error(
-                    f"Your gold input value of **{gold}** is invalid.\nDid you mean **{-gold if gold else randint(1, 1000)}** ?"
+                    f"Your gold input value of `{gold}` is invalid.\nDid you mean **{-gold if gold else randint(1, 1000)}** ?"
                 ),
                 ephemeral=True,
             )
             return
 
         # Retrieve donor user
-        await interaction.response.defer()
+        await interaction.response.defer(ephemeral=True)
         db = self.bot.get_db(interaction.guild)
         donor_member = interaction.user
-        donor_actor = db.find_one(Actor, Actor.id == donor_member.id)
+        donor_actor = db.find_one(
+            Actor, Actor.id == donor_member.id
+        ) or self.bot.create_actor(donor_member)
         if not donor_actor:
             await interaction.followup.send(
                 embed=EmbedX.error(f"There seems to be a problem from your side."),
@@ -47,7 +51,9 @@ async def donate(self, interaction: Interaction, member: Member, gold: int):
 
         # Retrieve recipient user
         recipient_member = member
-        recipient_actor = db.find_one(Actor, Actor.id == recipient_member.id)
+        recipient_actor = db.find_one(
+            Actor, Actor.id == recipient_member.id
+        ) or self.bot.create_actor(recipient_member)
         if not recipient_actor:
             await interaction.followup.send(
                 embed=EmbedX.error(
@@ -67,7 +73,7 @@ async def donate(self, interaction: Interaction, member: Member, gold: int):
         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**."
+                    f"You don't have enough to donate **💰 {gold}** gold.\nYou only have **💰 {donor_actor.gold}** gold."
                 )
             )
             return
@@ -77,20 +83,36 @@ async def donate(self, interaction: Interaction, member: Member, gold: int):
         recipient_actor.gold += gold
         db.save_all([donor_actor, recipient_actor])
 
-        # Create the response embed
+        # Send private response
+        await interaction.followup.send(
+            embed=EmbedX.success(
+                f"You transferred **💰 {gold}** gold to {recipient_member.mention}."
+            )
+        )
+
+        # Create public response embed
         embed = EmbedX.success(
             emoji="💛",
-            title="Gold Donation",
+            title="Donation",
             description=(
-                f"{recipient_member.mention} has received **💰 {gold} Gold** from {donor_member.mention}."
+                f"{donor_member.mention} has given gold to {recipient_member.mention}."
             ),
         )
+        embed.add_field(
+            name=f"{donor_actor.display_name}\nGold 🔻",
+            value=f"**💰 -{gold}**",
+        )
+        embed.add_field(
+            name=f"{recipient_member.display_name}\nGold 🔼",
+            value=f"**💰 +{gold}**",
+        )
         embed.set_author(
             name=donor_member.display_name, icon_url=donor_member.display_avatar
         )
         embed.set_thumbnail(url=recipient_member.display_avatar)
 
-        # Respond
-        await interaction.followup.send(
-            content=f"Congratulations, {recipient_member.mention}! 🎉", embed=embed
-        )
+        # Send public response
+        if isinstance(interaction.channel, Messageable):
+            await interaction.channel.send(
+                content=f"Congratulations, {recipient_member.mention}! 🎉", embed=embed
+            )

bot/cogs/game_cogs/farm_cog.py

@@ -12,7 +12,7 @@
 # ----------------------------------------------------------------------------------------------------
 # * Farm Cog
 # ----------------------------------------------------------------------------------------------------
-class FarmCog(Cog, description="Allows players to gain stats and roles."):
+class FarmCog(Cog, description="Allow players to gain stats and roles"):
     def __init__(self, bot: ActBot):
         self.bot = bot