Update app.py

app.py

@@ -1,35 +1,31 @@
+import requests
 import discord
 from discord.ext import commands
-from fastapi import FastAPI
-import uvicorn
 import asyncio
-import requests
 import re
 import os
-from dotenv import load_dotenv
+from flask import Flask
 
-# Load environment variables
-load_dotenv()
+# Flask app setup
+app = Flask(__name__)
 
-app = FastAPI()
-intents = discord.Intents.default()
-bot = commands.Bot(command_prefix='!', intents=intents)
-
-# Get token from environment variable
-TOKEN = os.getenv('TOKEN')
+TOKEN = os.environ['token']
 CHANNEL_ID = 1298830206387228682
 
 PETS_API = 'https://petsgo.biggamesapi.io/api/collection/Pets'
 EXISTS_API = 'https://existsapi.deno.dev/'
 RAP_API = 'https://petsgo.biggamesapi.io/api/rap'
 
+intents = discord.Intents.default()
+bot = commands.Bot(command_prefix='!', intents=intents)
+
 pet_images = {}
 pet_difficulties = {}
 pet_raps = {}
 
-@app.get("/")
-async def read_root():
-    return {"Hello": "World"}
+@app.route('/')
+def home():
+    return 'Hello World'
 
 async def update_rap_values():
     try:
@@ -70,10 +66,15 @@ async def get_huge_secret_pets():
                         if 'thumbnail' in config_data:
                             pet_images[pet_name] = config_data['thumbnail']
                             pet_images[f"Shiny {pet_name}"] = config_data['thumbnail']
+                            print(f"Stored image URL for {pet_name}: {config_data['thumbnail']}")
+                print(f"Found {len(huge_secret_pets)} pets to track (including shiny versions)")
                 return huge_secret_pets
+            else:
+                print("API response status not OK")
+                return []
     except Exception as e:
         print(f"Error fetching pets list: {e}")
-    return []
+        return []
 
 async def send_embed_message(channel, pet_name, previous_value, current_value, is_change=False):
     pet_image_url = pet_images.get(pet_name, None)
@@ -112,11 +113,13 @@ async def send_embed_message(channel, pet_name, previous_value, current_value, i
                 asset_id = pet_image_url.replace('rbxassetid://', '')
                 asset_id = re.search(r'^\d+', asset_id).group(0)
                 pet_image_url = f"https://rbxgleaks.pythonanywhere.com/asset/{asset_id}"
+            print(f"Using image URL for {pet_name}: {pet_image_url}")
             embed.set_thumbnail(url=pet_image_url)
     
     try:
         await channel.send(embed=embed)
     except discord.HTTPException as e:
+        print(f"Failed to send embed for {pet_name}: {e}")
         await channel.send(f"🎲 A {pet_name} was rolled! Exists: {current_display} (Previous: {previous_display})")
 
 async def petdata(tracked_pets):
@@ -132,8 +135,10 @@ async def petdata(tracked_pets):
                     value = pet['value']
                     pet_name = f"Shiny {pet_id}" if is_shiny else pet_id
                     if pet_name in pet_values:
+                        print(f"Found pet: {pet_name} with exist count {value}")
                         pet_values[pet_name] = value
                 return pet_values
+        print(f"Error code: {response.status_code}")
     except Exception as e:
         print(f"Error: {e}")
     return None
@@ -146,6 +151,7 @@ async def main_loop():
 
     tracked_pets = await get_huge_secret_pets()
     lastknown = {pet: None for pet in tracked_pets}
+    print(f"Initially tracking {len(tracked_pets)} pets")
     
     while True:
         if not tracked_pets:
@@ -153,8 +159,8 @@ async def main_loop():
             lastknown.update({pet: None for pet in tracked_pets if pet not in lastknown})
         
         await update_rap_values()
-        vvalues = await petdata(tracked_pets)
         
+        vvalues = await petdata(tracked_pets)
         if vvalues is not None:
             for pet, value in vvalues.items():
                 if lastknown[pet] is None:
@@ -162,10 +168,13 @@ async def main_loop():
                 elif value != lastknown[pet]:
                     await send_embed_message(channel, pet, lastknown[pet], value, is_change=True)
                 lastknown[pet] = value
-        
+        else:
+            print("Broken check")
+            
         if len(tracked_pets) > 0:
             new_pets = await get_huge_secret_pets()
             if set(new_pets) != set(tracked_pets):
+                print("Pet list updated!")
                 tracked_pets = new_pets
                 lastknown.update({pet: None for pet in tracked_pets if pet not in lastknown})
             
@@ -176,15 +185,7 @@ async def on_ready():
     print(f'Logged in as {bot.user.name}')
     bot.loop.create_task(main_loop())
 
-async def run_bot():
-    await bot.start(TOKEN)
-
-@app.on_event("startup")
-async def startup_event():
-    asyncio.create_task(run_bot())
-
-if __name__ == "__main__":
-    print("===== Application Startup =====")
-    print(f"FastAPI running on http://0.0.0.0:7860")
-    print("Discord bot starting...")
-    uvicorn.run("main:app", host="0.0.0.0", port=7860)
+if __name__ == '__main__':
+    import threading
+    threading.Thread(target=lambda: app.run(host='0.0.0.0', port=7860, debug=False, use_reloader=False)).start()
+    bot.run(TOKEN)