Update main.py

main.py

@@ -69,7 +69,8 @@ CACHE_UPDATE_INTERVAL_SECONDS = int(os.getenv('CACHE_UPDATE_INTERVAL_SECONDS', 6
 # Webhook URLs
 SCAMMER_WEBHOOK_URL = os.getenv("SCAMMER_WEBHOOK_URL")
 VALUE_WEBHOOK_URL = os.getenv("VALUE_WEBHOOK_URL")
-DUPE_CHECK_WEBHOOK_URL = os.getenv("DUPE_CHECK_WEBHOOK_URL")
+# Optional: Separate webhook for dupe checks? Keep using the general one for now.
+DUPE_CHECK_WEBHOOK_URL = os.getenv("WEBHOOK_URL")
 
 
 # --- Global Cache ---
@@ -79,7 +80,7 @@ cache = {
     "user_scammers": [],
     "server_scammers": [],
     "dwc": [],
-    "trusted": [],            # List of trusted users/servers
+    "trusted": [],            # New cache key for trusted entries
     "dupes": [],              # List of duped usernames
     "last_updated": None,     # Timestamp of the last successful/partial update
     "is_ready": False,        # Is the cache populated at least once?
@@ -378,29 +379,33 @@ def process_dwc_data(values): # For DWC Sheet
         processed_data.append(processed_item)
     return processed_data
 
-def process_trusted_data(values): # For Trusted Users/Servers Sheet
+def process_trusted_data(values): # New function for Trusted Sheet
     if not values: return []
     processed_data = []
     for row in values: # Expected range like B6:E
-        if not row or len(row) < 2: continue
+        if not row or len(row) < 1: continue # Need at least one identifier
         # Indices based on B6:E (0-indexed from B)
-        discord_id = clean_string_optional(row[0]) if len(row) > 0 else None # Col B
-        discord_username = clean_string_optional(row[1]) if len(row) > 1 else None # Col C
+        discord_user_id = clean_string_optional(row[0]) if len(row) > 0 else None # Col B
+        # discord_username = clean_string_optional(row[1]) if len(row) > 1 else None # Col C - Not currently used for matching, but keep for potential future use
         discord_server_id = clean_string_optional(row[2]) if len(row) > 2 else None # Col D
         roblox_username = clean_string_optional(row[3]) if len(row) > 3 else None # Col E
-        
-        # Skip if all identifiers are missing
-        if not discord_id and not discord_username and not discord_server_id and not roblox_username: continue
-        # Skip if it looks like a header row
-        if str(discord_id).lower() == 'discord id' or str(discord_username).lower() == 'discord username':
+
+        # Skip if all relevant identifiers are missing
+        if not discord_user_id and not discord_server_id and not roblox_username: continue
+
+        # Skip if it looks like a header row (check common header names)
+        if (str(discord_user_id).lower() == 'discord user id' or
+            str(discord_server_id).lower() == 'discord server id' or
+            str(roblox_username).lower() == 'roblox username'):
             continue
-            
+
         processed_item = {
-            'discord_id': discord_id,
-            'discord_username': discord_username,
+            'status': 'Trusted', # Add a status field
+            'discord_user_id': discord_user_id,
             'discord_server_id': discord_server_id,
             'roblox_username': roblox_username,
-            'roblox_avatar_url': None # Will be filled later
+            'roblox_avatar_url': None # Will be filled later if roblox_username exists
+            # Note: No explanation or evidence expected for trusted entries based on B6:E
         }
         processed_data.append(processed_item)
     return processed_data
@@ -532,8 +537,8 @@ async def update_cache_periodically():
                 "user_scammers": [],
                 "server_scammers": [],
                 "dwc": [],
+                "trusted": [], # Add trusted key
                 "dupes": [],
-                "trusted": [],            # List of trusted users/servers
             }
             current_errors = {} # Track errors for specific fetches/sheets
 
@@ -543,19 +548,19 @@ async def update_cache_periodically():
                     f"{quote_sheet_name(USER_SCAMMER_SHEET)}!{USER_SCAMMER_RANGE}",
                     f"{quote_sheet_name(SERVER_SCAMMER_SHEET)}!{SERVER_SCAMMER_RANGE}",
                     f"{quote_sheet_name(DWC_SHEET)}!{DWC_RANGE}",
-                    f"{quote_sheet_name(TRUSTED_SHEET)}!{TRUSTED_RANGE}",
+                    f"{quote_sheet_name(TRUSTED_SHEET)}!{TRUSTED_RANGE}", # Add trusted range
                 ]
                 scammer_dwc_processor_map = {
                     USER_SCAMMER_SHEET: process_user_scammer_data,
                     SERVER_SCAMMER_SHEET: process_server_scammer_data,
                     DWC_SHEET: process_dwc_data,
-                    TRUSTED_SHEET: process_trusted_data,
+                    TRUSTED_SHEET: process_trusted_data, # Add trusted processor
                 }
                 scammer_dwc_target_key_map = {
                     USER_SCAMMER_SHEET: "user_scammers",
                     SERVER_SCAMMER_SHEET: "server_scammers",
                     DWC_SHEET: "dwc",
-                    TRUSTED_SHEET: "trusted",
+                    TRUSTED_SHEET: "trusted", # Add trusted target key
                 }
 
                 values_dupes_ranges = [f"{quote_sheet_name(DUPE_LIST_SHEET)}!{DUPE_LIST_RANGE}"]
@@ -657,10 +662,11 @@ async def update_cache_periodically():
                 # --- Fetch Roblox Avatars (for new data before comparison/webhook) ---
                 if not current_errors.get("scammer_dwc_batch") and \
                    not current_errors.get("process_user_scammers") and \
-                   not current_errors.get("process_dwc"):
+                   not current_errors.get("process_dwc") and \
+                   not current_errors.get("process_trusted"): # Check trusted processing too
                     logger.info("Fetching Roblox avatars for newly processed data...")
                     avatar_tasks = []
-                    entries_needing_avatars = new_cache_data.get("user_scammers", []) + new_cache_data.get("dwc", []) + new_cache_data.get("trusted", [])
+                    entries_needing_avatars = new_cache_data.get("user_scammers", []) + new_cache_data.get("dwc", []) + new_cache_data.get("trusted", []) # Include trusted list
                     for entry in entries_needing_avatars:
                         if entry.get('roblox_username'):
                             avatar_tasks.append(fetch_avatar_for_entry_update(session, entry))
@@ -668,7 +674,7 @@ async def update_cache_periodically():
                         await asyncio.gather(*avatar_tasks) # Exceptions logged within helper
                     logger.info(f"Finished fetching avatars for {len(avatar_tasks)} potential new entries.")
                 else:
-                    logger.warning("Skipping avatar fetching due to errors in fetching/processing scammer/dwc data.")
+                    logger.warning("Skipping avatar fetching due to errors in fetching/processing scammer/dwc/trusted data.")
 
 
                 # --- Change Detection & Webhook Preparation (ONLY if cache is ready) ---
@@ -892,27 +898,17 @@ async def update_cache_periodically():
 
                     # Update scammer/DWC sections if their batch succeeded AND processing succeeded
                     if "scammer_dwc_batch" not in current_errors:
-                        for key in ["user_scammers", "server_scammers", "dwc", "trusted"]:
+                        for key in ["user_scammers", "server_scammers", "dwc"]:
                             process_error_key = f"process_{key}"
-                            logger.info(f"Partial update check for key: '{key}'")
                             if process_error_key not in current_errors:
-                                logger.info(f"--> No processing error found for '{key}'.")
-                                # Log the comparison details
-                                old_data = cache.get(key)
-                                new_data = new_cache_data.get(key) # Use .get for safety
-                                logger.info(f"--> Comparing for '{key}': cache has {len(old_data) if old_data is not None else 'None'} items, new data has {len(new_data) if new_data is not None else 'None'} items.")
-                                
-                                if old_data != new_data: 
-                                    logger.info(f"--> Data differs for '{key}'. UPDATING CACHE.")
-                                    cache[key] = new_data 
+                                 if cache.get(key) != new_cache_data[key]:
+                                    cache[key] = new_cache_data[key]
                                     partial_update_details.append(key)
                                     update_occurred = True
-                                else:
-                                    logger.info(f"--> Data is identical for '{key}'. Skipping update.")
                             else:
-                                logger.warning(f"--> Skipping update for '{key}' due to processing error: {current_errors.get(process_error_key)}")
+                                logger.warning(f"Skipping update for '{key}' due to processing error.")
                     else:
-                         logger.warning("Skipping update for 'user_scammers', 'server_scammers', 'dwc', 'trusted' due to batch fetch error.")
+                         logger.warning("Skipping update for 'user_scammers', 'server_scammers', 'dwc' due to batch fetch error.")
 
                     if update_occurred:
                          cache["last_updated"] = current_time # Mark partial update time
@@ -1012,8 +1008,8 @@ async def get_status():
             "user_scammers": len(cache.get("user_scammers", [])),
             "server_scammers": len(cache.get("server_scammers", [])),
             "dwc_entries": len(cache.get("dwc", [])),
+            "trusted_entries": len(cache.get("trusted", [])), # Add trusted count
             "duped_usernames": len(cache.get("dupes", [])),
-            "trusted_entries": len(cache.get("trusted", [])),
         },
          "value_change_categories_in_last_cycle": len(cache.get("value_changes", {}))
     }
@@ -1063,13 +1059,13 @@ async def get_all_value_changes():
 
 @app.get("/api/scammers")
 async def get_scammers():
-    """Get all scammer and DWC data (users, servers, dwc) from cache"""
+    """Get all scammer, DWC, and trusted data (users, servers, dwc, trusted) from cache"""
     check_cache_readiness()
     return {
         "users": cache.get("user_scammers", []),
         "servers": cache.get("server_scammers", []),
         "dwc": cache.get("dwc", []),
-        "trusted": cache.get("trusted", [])
+        "trusted": cache.get("trusted", []) # Include trusted list
     }
 
 @app.get("/api/dupes")