Update app.py

app.py

@@ -33,29 +33,22 @@ pet_difficulties = {}
 pet_raps = {}
 hourly_hatches = defaultdict(list)
 
-# [Previous functions remain exactly the same]
 async def update_rap_values():
     try:
         response = requests.get(RAP_API)
         if response.status_code == 200:
             data = response.json()
             if data['status'] == 'ok':
-                # Clear existing RAP values
                 pet_raps.clear()
-                
-                # Process each pet in the list
                 for pet_data in data['data']:
                     config_data = pet_data['configData']
                     pet_id = config_data['id']
                     value = pet_data['value']
-                    
-                    # Check if it's a shiny pet
                     is_shiny = config_data.get('sh', False)
                     if is_shiny:
                         pet_raps[f"Shiny {pet_id}"] = value
                     else:
                         pet_raps[pet_id] = value
-                        
                 print(f"Updated RAP values for {len(data['data'])} pets")
     except Exception as e:
         print(f"Error fetching RAP values: {e}")
@@ -67,37 +60,26 @@ async def get_huge_secret_pets():
             data = response.json()
             if data['status'] == 'ok':
                 huge_secret_pets = []
-                
                 for pet in data['data']:
                     config_data = pet['configData']
                     if config_data.get('huge') or config_data.get('secret'):
                         pet_name = config_data['name']
                         huge_secret_pets.append(pet_name)
                         huge_secret_pets.append(f"Shiny {pet_name}")
-                        
-                        # Store difficulty value
                         difficulty = config_data.get('difficulty', 'Unknown')
                         pet_difficulties[pet_name] = difficulty
-                        # Shiny pets are 100x harder
                         pet_difficulties[f"Shiny {pet_name}"] = difficulty * 100
-                        
                         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):
     if is_change and current_value > previous_value:
-        # Record hatch timestamp when a new pet is detected
         hatches = current_value - previous_value
         for _ in range(hatches):
             hourly_hatches[pet_name].append(datetime.now())
@@ -106,24 +88,21 @@ async def send_embed_message(channel, pet_name, previous_value, current_value, i
     difficulty = pet_difficulties.get(pet_name, "Unknown")
     rap_value = pet_raps.get(pet_name, "No RAP")
     
-    # Format RAP value with commas
     if isinstance(rap_value, (int, float)):
         rap_display = f"{rap_value:,}"
     else:
         rap_display = rap_value
     
-    # Format difficulty with commas
     if isinstance(difficulty, (int, float)):
         difficulty_display = f"{difficulty:,}"
     else:
         difficulty_display = difficulty
-        
-    # Format exist counts with commas
+    
     if isinstance(current_value, (int, float)):
         current_display = f"{current_value:,}"
     else:
         current_display = current_value
-        
+    
     if isinstance(previous_value, (int, float)):
         previous_display = f"{previous_value:,}"
     else:
@@ -141,7 +120,6 @@ 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)
     
@@ -158,17 +136,14 @@ async def petdata(tracked_pets):
             data = response.json()
             if data['status'] == 'ok':
                 pet_values = {pet: 0 for pet in tracked_pets}
-
                 for pet in data['data']:
                     pet_id = pet['configData']['id']
                     is_shiny = pet['configData'].get('sh', False)
                     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:
@@ -186,9 +161,8 @@ async def main_loop():
     print(f"Initially tracking {len(tracked_pets)} pets")
     
     while True:
-        cleanup_old_hatches()  # Clean up old hatch records periodically
+        cleanup_old_hatches()
         
-        # [Rest of the main_loop function remains the same]
         if not tracked_pets:
             tracked_pets = await get_huge_secret_pets()
             lastknown.update({pet: None for pet in tracked_pets if pet not in lastknown})
@@ -216,7 +190,6 @@ async def main_loop():
         await asyncio.sleep(60)
 
 def cleanup_old_hatches():
-    """Remove hatch records older than 1 hour"""
     one_hour_ago = datetime.now() - timedelta(hours=1)
     for pet in hourly_hatches:
         hourly_hatches[pet] = [timestamp for timestamp in hourly_hatches[pet] 
@@ -224,7 +197,6 @@ def cleanup_old_hatches():
 
 @bot.command(name='lasthour')
 async def last_hour_stats(ctx):
-    """Command to show hatching statistics for the last hour"""
     cleanup_old_hatches()
     
     if not hourly_hatches:
@@ -239,7 +211,6 @@ async def last_hour_stats(ctx):
         color=discord.Color.green()
     )
     
-    # Sort pets by number of hatches (descending)
     sorted_pets = sorted(
         hourly_hatches.items(), 
         key=lambda x: len(x[1]), 
@@ -247,12 +218,11 @@ async def last_hour_stats(ctx):
     )
     
     for pet_name, hatches in sorted_pets:
-        if hatches:  # Only show pets that were hatched
+        if hatches:
             count = len(hatches)
             difficulty = pet_difficulties.get(pet_name, "Unknown")
             rap_value = pet_raps.get(pet_name, "No RAP")
             
-            # Format values with commas
             if isinstance(rap_value, (int, float)):
                 rap_display = f"{rap_value:,}"
             else:
@@ -269,22 +239,15 @@ async def last_hour_stats(ctx):
                 inline=True
             )
     
-    # Add timestamp
     embed.set_footer(text=f"Last updated: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}")
     
     await ctx.send(embed=embed)
 
-@bot.event
-async def on_ready():
-    print(f'Logged in as {bot.user.name}')
-    bot.loop.create_task(main_loop())
-
 @bot.event
 async def on_ready():
     print(f'Logged in as {bot.user.name}')
     bot.loop.create_task(main_loop())
     
-    # Start the web server
     runner = web.AppRunner(app)
     await runner.setup()
     site = web.TCPSite(runner, '0.0.0.0', 7860)
@@ -292,7 +255,7 @@ async def on_ready():
     print(f"Web server started on port 7860")
 
 def run_bot():
-    bot.run(token)
+    bot.run(TOKEN)
 
 if __name__ == "__main__":
     run_bot()