feat: Add bank and wallet balance commands with improved transfer validation

- Added /bank and /wallet commands to check user balances
- Enhanced transfer validation to check for valid number input
- Included debug token logging in main function (to be removed in production)
- Added account creation logic for new users in balance commands
- Improved error handling for invalid transfer amounts

bot.py

@@ -49,6 +49,10 @@ def main():
     token = os.getenv("DISCORD_TOKEN") or os.getenv("TOKEN")
     if not token:
         raise SystemExit("ERROR: Discord token not found. Set DISCORD_TOKEN or TOKEN in environment.")
+    
+    # Print the token for debugging purposes (remove this in production)
+    print(f"DEBUG: Using token starting with {token[:5]}.")
+    
     client.run(token)
 
 

cogs/economy.py

@@ -18,6 +18,9 @@ from utils.sql_commands import DatabaseManager
 def validate_transfer(
     payer_balance: int, author_id: int, receiver_id: int, amount: int
 ) -> tuple[bool, str]:
+    # Validate amount is a positive number
+    if not isinstance(amount, (int, float)):
+        return False, "Amount must be a number"
     if amount <= 0:
         return False, "Please enter an amount greater than 0."
 
@@ -400,6 +403,79 @@ class Economy(commands.Cog):
                 mention_author=False,
             )
 
+    @commands.command(name="bank", brief="Check your bank balance", description="Check your bank balance.")
+    async def _bank(self, ctx: commands.Context, member: discord.Member | None = None):
+        """Check your bank balance."""
+        target: discord.Member | discord.User = member or ctx.author
+
+        # Ensure the target is not a bot
+        if target.bot:
+            return
+
+        # Get the user's data
+        user_data = await bank_data(target)
+        wallet_balance = user_data.get("WALLET", 0)
+        bank_balance = user_data.get("BANK", 0)
+
+        # Create an account if one does not exist
+        if bank_balance is None or wallet_balance is None:
+            await create_account(target)
+            user_data = await bank_data(target)
+            wallet_balance = user_data.get("WALLET", 0)
+            bank_balance = user_data.get("BANK", 0)
+
+        # Reply with the user's bank balance
+        await ctx.reply(
+            f"{target.mention} has {bank_balance:,}<:flooney:1194943899765051473> in their bank."
+        )
+
+    @commands.command(name="wallet", brief="Check your wallet balance", description="Check your wallet balance.")
+    async def _wallet(self, ctx: commands.Context, member: discord.Member | None = None):
+        """Check your wallet balance."""
+        target: discord.Member | discord.User = member or ctx.author
+
+        # Ensure the target is not a bot
+        if target.bot:
+            return
+
+        # Get the user's data
+        user_data = await bank_data(target)
+        wallet_balance = user_data.get("WALLET", 0)
+        bank_balance = user_data.get("BANK", 0)
+
+        # Create an account if one does not exist
+        if bank_balance is None or wallet_balance is None:
+            await create_account(target)
+            user_data = await bank_data(target)
+            wallet_balance = user_data.get("WALLET", 0)
+            bank_balance = user_data.get("BANK", 0)
+
+        # Reply with the user's wallet balance
+        await ctx.reply(
+            f"{target.mention} has {wallet_balance:,}<:flooney:1194943899765051473> in their wallet."
+        )
+
+    @commands.command(name="transfer", brief="Transfer money from bank to another user", description="Transfer money from your bank to another user's bank.")
+    async def _transfer(self, ctx, target: discord.Member, amount: int):
+        """
+        Transfer money from your bank account to another user's bank account.
+        """
+        payer_bank = int((await bank_data(ctx.author)).get("BANK", 0))
+        receiver_bank = int((await bank_data(target)).get("BANK", 0))
+
+        valid, reason = validate_transfer(
+            payer_bank, ctx.author.id, target.id, amount
+        )
+        if not valid:
+            return await ctx.reply(reason, mention_author=False)
+
+        await update_money(target, bank=amount)
+        await update_money(ctx.author, bank=-amount)
+
+        await ctx.reply(
+            f"Transferred {amount:,} flooneys to {target}.", mention_author=False
+        )
+
     r"""
     .----------------.  .----------------.  .----------------.  .----------------. 
     | .--------------. || .--------------. || .--------------. || .--------------. |

utils/bank_functions.py

@@ -27,7 +27,11 @@ async def bank_data(user: discord.Member | discord.User) -> Dict[str, int]:
     if balance is None:
         await create_account(user)
         return await bank_data(user)
-    return balance
+    # Ensure we return a dictionary with WALLET and BANK keys
+    return {
+        "WALLET": balance.get("WALLET", 0),
+        "BANK": balance.get("BANK", 0)
+    }
 
 
 async def record_transaction(
@@ -88,5 +92,4 @@ async def update_daily_timestamp(user: discord.User | discord.Member, timestamp:
     Updates the DAILY_TIMESTAMP field for the user in the economy table.
     Stores the timestamp as a float (UNIX time).
     """
-    db.execute_query("UPDATE economy SET DAILY = %s WHERE ID = %s",(timestamp.timestamp(), user.id),
+    db.execute_query("UPDATE economy SET DAILY = %s WHERE ID = %s",(timestamp.timestamp(), user.id))
-    )

utils/sql_commands.py

@@ -273,7 +273,8 @@ class DatabaseManager:
                 cursor.execute(query, params or ())
                 connection.commit()
                 logger.info(f"Executed query: {query} with params: {params}")
-                return cursor.rowcount
+                # Return the actual cursor results instead of closing it
+                return cursor.fetchall() if cursor.with_rows else cursor.rowcount
             except mysql.connector.Error as err:
                 logger.warning(f"Attempt {attempt + 1} failed: {err}")
                 time.sleep(delay * (2**attempt))