Update app.py

app.py

@@ -1,11 +1,10 @@
 import discord
 from discord import app_commands
-import aiohttp
 import asyncio
 from fastapi import FastAPI
 import uvicorn
-import random
-import time
+
+from commands import petsimgo, petroll, cash, dice, admincash
 
 app = FastAPI()
 intents = discord.Intents.default()
@@ -13,267 +12,15 @@ intents.message_content = True
 bot = discord.Client(intents=intents)
 tree = app_commands.CommandTree(bot)
 
-luck_multipliers = {}
-luck_expiration = {}
-luck_opportunities = {}
-user_cash = {}
-
 @app.get("/")
 async def read_root():
     return {"Hello": "World"}
 
-@tree.command(name="petsimgo", description="get info on pet on petsgo u")
-async def petsimgo(interaction: discord.Interaction, petname: str):
-    await interaction.response.defer()
-
-    async def fetch_data(url):
-        async with aiohttp.ClientSession() as session:
-            async with session.get(url) as response:
-                if response.status == 200:
-                    return await response.json()
-                return None
-
-    exists_data = await fetch_data("https://petsgo.biggamesapi.io/api/exists")
-    rap_data = await fetch_data("https://petsgo.biggamesapi.io/api/Rap")
-    collection_data = await fetch_data("https://petsgo.biggamesapi.io/api/collection/Pets")
-
-    if not exists_data or not rap_data or not collection_data:
-        await interaction.followup.send("error")
-        return
-
-    pet_exists = next((pet for pet in exists_data['data'] if pet['configData']['id'].lower() == petname.lower()), None)
-    pet_rap = next((pet for pet in rap_data['data'] if pet['configData']['id'].lower() == petname.lower()), None)
-    pet_info = next((pet for pet in collection_data['data'] if pet['configName'].lower() == petname.lower()), None)
-
-    if not pet_exists or not pet_rap or not pet_info:
-        await interaction.followup.send(f"Pet '{petname}' not found.")
-        return
-
-    exists_value = pet_exists['value']
-    rap_value = pet_rap['value']
-    thumbnail_id = pet_info['configData']['thumbnail'].split('://')[1]
-    
-    thumbnail_url = f"https://api.rbxgleaks1.workers.dev/asset/{thumbnail_id}"
-
-    def format_difficulty(difficulty):
-        if difficulty >= 1_000_000_000:
-            return f"{difficulty / 1_000_000_000:.1f}B ({difficulty:,})"
-        elif difficulty >= 1_000_000:
-            return f"{difficulty / 1_000_000:.1f}M ({difficulty:,})"
-        elif difficulty >= 1_000:
-            return f"{difficulty / 1_000:.1f}K ({difficulty:,})"
-        else:
-            return f"{difficulty} ({difficulty:,})"
-
-    embed = discord.Embed(title=f"PetsGo: {pet_info['configData']['name']}", color=0x787878)
-    embed.add_field(name="value", value=f"{rap_value:,} diamonds", inline=True)
-    embed.add_field(name="existing", value=f"{exists_value:,}", inline=True)
-    embed.add_field(name="difficulty", value=format_difficulty(pet_info['configData']['difficulty']), inline=True)
-    embed.add_field(name="category", value=pet_info['category'], inline=True)
-    embed.set_thumbnail(url=thumbnail_url)
-    embed.set_footer(text="hello everyone can i please get a burrito now")
-
-    await interaction.followup.send(embed=embed)
-
-async def perform_roll(interaction: discord.Interaction):
-    async def fetch_data(url):
-        async with aiohttp.ClientSession() as session:
-            async with session.get(url) as response:
-                if response.status == 200:
-                    return await response.json()
-                return None
-
-    rap_data = await fetch_data("https://petsgo.biggamesapi.io/api/Rap")
-    collection_data = await fetch_data("https://petsgo.biggamesapi.io/api/collection/Pets")
-
-    if not rap_data or not collection_data:
-        return None
-
-    pets = [pet for pet in collection_data['data'] if pet['configName'] in [p['configData']['id'] for p in rap_data['data']]]
-    
-    if not pets:
-        return None
-
-    user_id = interaction.user.id
-    luck_multiplier = luck_multipliers.get(user_id, 1)
-    
-    sorted_pets = sorted(pets, key=lambda x: x['configData']['difficulty'])
-    
-    max_index = len(sorted_pets) - 1
-    index = int(max_index * (luck_multiplier - 1) / 9)
-    
-    rolled_pet = random.choice(sorted_pets[:index+1])
-
-    pet_rap = next((pet for pet in rap_data['data'] if pet['configData']['id'] == rolled_pet['configName']), None)
-
-    if not pet_rap:
-        return None
-
-    rap_value = pet_rap['value']
-    thumbnail_id = rolled_pet['configData']['thumbnail'].split('://')[1]
-    thumbnail_url = f"https://api.rbxgleaks1.workers.dev/asset/{thumbnail_id}"
-
-    def format_difficulty(difficulty):
-        if difficulty >= 1_000_000_000:
-            return f"{difficulty / 1_000_000_000:.1f}B ({difficulty:,})"
-        elif difficulty >= 1_000_000:
-            return f"{difficulty / 1_000_000:.1f}M ({difficulty:,})"
-        elif difficulty >= 1_000:
-            return f"{difficulty / 1_000:.1f}K ({difficulty:,})"
-        else:
-            return f"{difficulty} ({difficulty:,})"
-
-    embed = discord.Embed(title=f"{interaction.user.name} rolled: {rolled_pet['configData']['name']}", color=0x787878)
-    embed.add_field(name="value", value=f"{rap_value:,} diamonds", inline=True)
-    embed.add_field(name="difficulty", value=format_difficulty(rolled_pet['configData']['difficulty']), inline=True)
-    embed.add_field(name="category", value=rolled_pet['category'], inline=True)
-    embed.set_thumbnail(url=thumbnail_url)
-    
-    luck_text = ""
-    if user_id in luck_expiration:
-        remaining_time = int(luck_expiration[user_id] - time.time())
-        if remaining_time > 0:
-            luck_percentage = (luck_multiplier - 1) * 100
-            luck_text = f"\nYou have {remaining_time // 60} minutes and {remaining_time % 60} seconds of luck left! ({luck_percentage}% luck)"
-        else:
-            del luck_multipliers[user_id]
-            del luck_expiration[user_id]
-    
-    embed.set_footer(text=f"Click 'Roll Again' to roll again!{luck_text}")
-
-    roll_again_button = discord.ui.Button(style=discord.ButtonStyle.primary, label="Roll Again", custom_id="roll_again")
-    
-    async def roll_again_callback(interaction: discord.Interaction):
-        await interaction.response.defer()
-        result = await perform_roll(interaction)
-        if result:
-            await interaction.followup.send(embed=result[0], view=result[1])
-        else:
-            await interaction.followup.send("errer.")
-
-    roll_again_button.callback = roll_again_callback
-
-    view = discord.ui.View()
-    view.add_item(roll_again_button)
-
-    if random.random() < 0.2:
-        luck_opportunities[user_id] = luck_opportunities.get(user_id, 0) + 1
-        increase_luck_button = discord.ui.Button(style=discord.ButtonStyle.success, label="Increase Luck", custom_id=f"increase_luck_{luck_opportunities[user_id]}")
-        
-        async def increase_luck_callback(interaction: discord.Interaction):
-            if interaction.user.id != user_id:
-                await interaction.response.send_message("cannot use", ephemeral=True)
-                return
-            
-            current_luck = luck_multipliers.get(user_id, 1)
-            new_luck = min(current_luck + 1, 10)
-            luck_multipliers[user_id] = new_luck
-            luck_expiration[user_id] = time.time() + 1800
-            
-            luck_percentage = (new_luck - 1) * 100
-            await interaction.response.send_message(f"luck increased to {luck_percentage}% for 30 minutes!", ephemeral=True)
-            
-            for item in view.children:
-                if item.custom_id == interaction.custom_id:
-                    view.remove_item(item)
-                    break
-            await interaction.message.edit(view=view)
-        
-        increase_luck_button.callback = increase_luck_callback
-        view.add_item(increase_luck_button)
-
-    return embed, view
-
-@tree.command(name="petroll", description="Roll for a random pet")
-async def petroll(interaction: discord.Interaction):
-    await interaction.response.defer()
-    result = await perform_roll(interaction)
-    if result:
-        await interaction.followup.send(embed=result[0], view=result[1])
-    else:
-        await interaction.followup.send("errer")
-
-@tree.command(name="cash", description="Check your current cash balance or claim free cash")
-async def cash(interaction: discord.Interaction):
-    user_id = interaction.user.id
-    balance = user_cash.get(user_id, 0)
-
-    if balance == 0:
-        user_cash[user_id] = 100
-        balance = 100
-        message = "You've claimed your free $100! Your current balance is $100.00"
-    else:
-        message = f"Your current balance is ${balance:.2f}"
-
-    embed = discord.Embed(title="Cash Balance", description=message, color=0x00ff00)
-    embed.set_footer(text="Use /dice to bet your cash!")
-
-    await interaction.response.send_message(embed=embed)
-
-@tree.command(name="dice", description="Roll the dice and bet")
-async def dice(interaction: discord.Interaction, bet: int):
-    user_id = interaction.user.id
-    balance = user_cash.get(user_id, 0)
-    
-    if bet <= 0:
-        await interaction.response.send_message("Your bet must be greater than 0.")
-        return
-    
-    if bet > balance:
-        await interaction.response.send_message(f"You don't have enough cash. Your current balance is ${balance:.2f}")
-        return
-    
-    embed = discord.Embed(title="Dice Roll", description=f"{interaction.user.name} is betting ${bet:.2f}", color=0x00ff00)
-    embed.add_field(name="Current Balance", value=f"${balance:.2f}", inline=False)
-    
-    roll_button = discord.ui.Button(style=discord.ButtonStyle.primary, label="Roll the Dice", custom_id="roll_dice")
-    
-    async def roll_dice_callback(interaction: discord.Interaction):
-        nonlocal balance
-        result = random.choice(["win", "lose"])
-        
-        if result == "win":
-            winnings = bet
-            balance += winnings
-            result_text = f"You won ${winnings:.2f}!"
-        else:
-            balance -= bet
-            result_text = f"You lost ${bet:.2f}."
-        
-        user_cash[user_id] = balance
-        
-        embed.clear_fields()
-        embed.add_field(name="Result", value=result_text, inline=False)
-        embed.add_field(name="New Balance", value=f"${balance:.2f}", inline=False)
-        
-        roll_again_button = discord.ui.Button(style=discord.ButtonStyle.primary, label="Roll Again", custom_id="roll_again")
-        roll_again_button.callback = lambda i: dice(i, bet)
-        
-        new_view = discord.ui.View()
-        new_view.add_item(roll_again_button)
-        
-        await interaction.response.edit_message(embed=embed, view=new_view)
-    
-    roll_button.callback = roll_dice_callback
-    
-    view = discord.ui.View()
-    view.add_item(roll_button)
-    
-    await interaction.response.send_message(embed=embed, view=view)
-
-@tree.command(name="admincash", description="Admin command to add cash to a specific user")
-async def admincash(interaction: discord.Interaction, user: discord.User, amount: int):
-    if interaction.user.id != 696434794174611477:
-        await interaction.response.send_message("You are not authorized to use this command.", ephemeral=True)
-        return
-
-    user_cash[user.id] = user_cash.get(user.id, 0) + amount
-    new_balance = user_cash[user.id]
-
-    embed = discord.Embed(title="Admin Cash Added", description=f"Added ${amount:.2f} to {user.name}'s balance", color=0x00ff00)
-    embed.add_field(name="New Balance", value=f"${new_balance:.2f}", inline=False)
-
-    await interaction.response.send_message(embed=embed)
+tree.add_command(petsimgo.petsimgo)
+tree.add_command(petroll.petroll)
+tree.add_command(cash.cash)
+tree.add_command(dice.dice)
+tree.add_command(admincash.admincash)
 
 @bot.event
 async def on_ready():