Update main.py

main.py

@@ -50,6 +50,8 @@ SERVER_SCAMMER_SHEET = "Server Scammer Files"
 SERVER_SCAMMER_RANGE = "B6:F"
 DWC_SHEET = "DWC Servers / Users"
 DWC_RANGE = "B6:G"
+TRUSTED_SHEET = "Trusted Users / Servers"
+TRUSTED_RANGE = "B6:E"
 
 # Sheet Names and Ranges within VALUES_DUPE_SPREADSHEET_ID
 DUPE_LIST_SHEET = "Dupe List"
@@ -67,8 +69,7 @@ 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")
-# Optional: Separate webhook for dupe checks? Keep using the general one for now.
-DUPE_CHECK_WEBHOOK_URL = os.getenv("WEBHOOK_URL")
+DUPE_CHECK_WEBHOOK_URL = os.getenv("DUPE_CHECK_WEBHOOK_URL")
 
 
 # --- Global Cache ---
@@ -78,6 +79,7 @@ cache = {
     "user_scammers": [],
     "server_scammers": [],
     "dwc": [],
+    "trusted": [],            # List of trusted users/servers
     "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?
@@ -376,6 +378,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
+    if not values: return []
+    processed_data = []
+    for row in values: # Expected range like B6:E
+        if not row or len(row) < 2: continue
+        # 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_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':
+            continue
+            
+        processed_item = {
+            'discord_id': discord_id,
+            'discord_username': discord_username,
+            'discord_server_id': discord_server_id,
+            'roblox_username': roblox_username,
+            'roblox_avatar_url': None # Will be filled later
+        }
+        processed_data.append(processed_item)
+    return processed_data
+
 def process_dupe_list_data(values): # For Dupe List Sheet
     if not values: return []
     # Expected range like B2:B
@@ -513,16 +542,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}",
                 ]
                 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,
                 }
                 scammer_dwc_target_key_map = {
                     USER_SCAMMER_SHEET: "user_scammers",
                     SERVER_SCAMMER_SHEET: "server_scammers",
                     DWC_SHEET: "dwc",
+                    TRUSTED_SHEET: "trusted",
                 }
 
                 values_dupes_ranges = [f"{quote_sheet_name(DUPE_LIST_SHEET)}!{DUPE_LIST_RANGE}"]
@@ -1024,7 +1056,8 @@ async def get_scammers():
     return {
         "users": cache.get("user_scammers", []),
         "servers": cache.get("server_scammers", []),
-        "dwc": cache.get("dwc", [])
+        "dwc": cache.get("dwc", []),
+        "trusted": cache.get("trusted", [])
     }
 
 @app.get("/api/dupes")