Update app.py

app.py

@@ -15,7 +15,7 @@ CSV_FILE = 'endpoints.csv'
 # -------------------------------------------------------------------------
 
 def load_data():
-    """Loads the endpoints from the CSV file."""
+    """Loads the endpoints from the CSV file. (Kept for UI compatibility, but unused in new logic)"""
     if not os.path.exists(CSV_FILE):
         return []
     
@@ -32,37 +32,22 @@ def load_data():
         return []
 
 def get_type1_choices():
-    """Extracts unique TYPE1 categories."""
-    data = load_data()
-    if not data:
-        return []
-    return list(set([item.get('TYPE1') for item in data if item.get('TYPE1')]))
+    # Only returning a placeholder or 'Manual' since the CSV reports are not used
+    return ["Manual URL Report"]
 
 def get_type2_choices(selected_type1):
-    """Extracts TYPE2 options based on selected TYPE1."""
-    data = load_data()
-    if not data or not selected_type1:
-        return []
-    
-    choices = [item.get('TYPE2') for item in data if item.get('TYPE1') == selected_type1]
-    unique_choices = list(set(choices))
-    unique_choices.sort()
-    
-    all_option = f"ALL {selected_type1.upper()} REPORTS"
-    return [all_option] + unique_choices
+    return ["Run Batch"]
 
 # -------------------------------------------------------------------------
 # ROBUST LINK RESOLVER
 # -------------------------------------------------------------------------
 
 def resolve_tiktok_link(url):
-    """
-    Attempts to fetch Object ID, Owner ID, and SecUID from a TikTok URL.
-    (This function remains unchanged as it resolves IDs, not sends the report)
-    """
+    # This remains unchanged
+    # ... (existing ID extraction logic) ...
     if not url:
         return "", "", "", "", "❌ Error: Please enter a URL first."
-
+    # ... (rest of resolve_tiktok_link unchanged) ...
     headers = {
         "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
         "Referer": "https://www.tiktok.com/",
@@ -166,39 +151,23 @@ def resolve_tiktok_link(url):
     except Exception as e:
         return "", "", "", "", f"❌ Network Error: {str(e)}"
 
+
 # -------------------------------------------------------------------------
 # REPORT EXECUTION LOGIC
 # -------------------------------------------------------------------------
 
-def sign_tiktok_request(unsigned_url, user_agent):
+def patch_master_url(original_url, new_params):
     """
-    *** CRITICAL: PLACEHOLDER FOR EXTERNAL SIGNING SERVICE ***
-    
-    This function should call a third-party service that calculates 
-    the X-Bogus, msToken, and _signature for the given unsigned_url 
-    and User-Agent. It should return the fully signed URL.
-    
-    The existing failure (200 OK/Empty Body) is due to the lack of a 
-    valid X-Bogus matching the new object_id/parameters.
-    
-    Since we cannot implement the signing here, we return the unsigned URL.
+    Patches a FULLY SIGNED URL by only replacing the Target IDs
+    while keeping all other parameters (including signatures) intact.
     """
-    
-    return unsigned_url # Returns the unsigned URL until a signing service is integrated.
-
-def patch_url(original_url, new_params):
     parsed = urlparse(original_url)
-    
-    # 1. Parse all parameters, taking the first value from the list (TikTok uses single values)
     original_query = parse_qs(parsed.query)
+    
     # Convert query list values to single string values
     params = {k: v[0] for k, v in original_query.items()}
 
-    # 2. DEFINITIONS: Keys to be REMOVED (Signatures/Dynamic Hashes)
-    # These must be regenerated by an external service
-    signature_keys = ['X-Bogus', 'msToken', '_signature', 'X-Gnarly', 'tt_webid', 'tt_webid_v2']
-    
-    # 3. DEFINITIONS: Keys to be REPLACED (Target IDs)
+    # Keys to be REPLACED (Target IDs)
     target_mapping = {
         'object_id': new_params.get('object_id'),
         'owner_id': new_params.get('owner_id'),
@@ -210,47 +179,36 @@ def patch_url(original_url, new_params):
         'object_owner_id': new_params.get('owner_id'),
     }
 
-    # 4. Cleanup: Remove all old signatures
-    for key in signature_keys:
-        if key in params:
-            del params[key]
-
-    # 5. Patch: Overwrite/Set all target IDs
+    # Overwrite/Set all target IDs
     for param_key, new_value in target_mapping.items():
         if new_value and new_value.strip():
             # Apply the new ID if the key exists OR if it's a common target key
             params[param_key] = new_value.strip()
 
-
-    # 6. Rebuild the URL
-    # doseq=False ensures parameters are not encoded as lists (e.g., param=a&param=b)
+    # Rebuild the URL
     new_query = urlencode(params, doseq=False) 
     
-    # --- CRITICAL FIX: Replace '+' with '%20' for TikTok URL compatibility ---
+    # CRITICAL FIX: Replace '+' with '%20' for TikTok URL compatibility
     new_query = new_query.replace('+', '%20')
-    # -----------------------------------------------------------------------
     
     new_url = urlunparse(parsed._replace(query=new_query))
     
     return new_url
 
-def execute_reports(type1, type2, obj_id, own_id, sec_uid, nick):
-    data = load_data()
-    if not data:
-        yield "❌ Error: endpoints.csv not found or empty."
-        return
-
-    all_check_str = f"ALL {type1.upper()} REPORTS"
-    if type2 == all_check_str:
-        targets = [item for item in data if item.get('TYPE1') == type1]
-        yield f"🚀 Preparing ALL {len(targets)} reports for: {type1}...\n"
-    else:
-        targets = [item for item in data if item.get('TYPE1') == type1 and item.get('TYPE2') == type2]
-        yield f"🚀 Preparing specific report: {type2}...\n"
-
-    if not targets:
-        yield "❌ No matching endpoints found in CSV."
+def execute_reports(master_url_batch, obj_id, own_id, sec_uid, nick, *args):
+    """
+    Executes a batch of reports based on the multiple signed URLs provided by the user.
+    """
+    if not master_url_batch or not master_url_batch.strip():
+        yield "❌ Error: Master URL Batch is empty. Please paste one or more full, working report URLs."
         return
+        
+    # Split the multi-line input into a list of URLs
+    master_urls = [u.strip() for u in master_url_batch.split('\n') if u.strip()]
+    
+    if not master_urls:
+         yield "❌ Error: No valid URLs found in the Master URL Batch input."
+         return
 
     custom_target_data = {
         'object_id': obj_id,
@@ -258,6 +216,9 @@ def execute_reports(type1, type2, obj_id, own_id, sec_uid, nick):
         'sec_uid': sec_uid,
         'nickname': nick
     }
+    
+    if not obj_id or not own_id or not sec_uid or not nick:
+         yield "⚠️ WARNING: One or more target IDs are missing. The server may reject requests. Proceeding anyway."
 
     headers = {
         "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
@@ -266,34 +227,32 @@ def execute_reports(type1, type2, obj_id, own_id, sec_uid, nick):
 
     log_history = ""
     
-    for i, target in enumerate(targets):
-        original_url = target.get('URL')
-        report_name = target.get('TYPE2')
-        
-        if not original_url:
-            continue
-
-        # 1. Patch the URL: Swaps IDs AND removes the old, invalid signatures
-        unsigned_url = patch_url(original_url, custom_target_data)
+    yield f"🚀 Preparing {len(master_urls)} unique report types to send...\n"
+    
+    for i, original_url in enumerate(master_urls):
         
-        # 2. Sign the URL: This is the step that requires an external service
-        final_url = sign_tiktok_request(unsigned_url, headers["User-Agent"])
+        # 1. Patch the URL: Swaps Target IDs but retains all original signatures and reason codes.
+        final_url = patch_master_url(original_url, custom_target_data)
         
-        # Log a warning if the URL is still unsigned
-        # Checking for X-Bogus is enough, as msToken is sometimes legitimately absent in web calls
-        if 'X-Bogus' not in final_url and 'msToken' not in final_url: 
-             log_history += f"[{time.strftime('%H:%M:%S')}] ⚠️ WARNING: Request is UNSIGNED. Expected failure due to missing signature.\n"
+        # Attempt to extract report reason for logging clarity
+        try:
+            reason_code = parse_qs(urlparse(original_url).query).get('reason', ['UNKNOWN'])[0]
+            report_name = f"Reason: {reason_code} / Type: {parse_qs(urlparse(original_url).query).get('report_type', ['user'])[0]}"
+        except:
+            report_name = f"Report {i+1}"
         
+        # Log a warning that we're hoping the server doesn't notice the ID swap
+        log_history += f"[{time.strftime('%H:%M:%S')}] 💡 NOTE: Attempting to swap IDs with original URL's signature.\n"
+
         try:
-            # 3. Send the Request
+            # 2. Send the Request
             response = requests.get(final_url, headers=headers)
             timestamp = time.strftime("%H:%M:%S")
             
-            # 4. Detailed Response Logging
+            # 3. Detailed Response Logging
             response_content = ""
             if not response.text.strip():
-                # This log is explicitly what's expected from an unsigned/mismatched request
-                response_content = "[Empty Response Body] (Likely Signature Mismatch/Rejected)"
+                response_content = "[Empty Response Body] (Likely Signature/ID Mismatch)"
             else:
                 try:
                     parsed = response.json()
@@ -305,9 +264,9 @@ def execute_reports(type1, type2, obj_id, own_id, sec_uid, nick):
             # Check for 200 and a JSON indicator of success (like "code":0 or "success":true)
             status_icon = "✅" if response.status_code == 200 and ('success' in response_content or 'code":0' in response_content) else "⚠️"
             
-            # 5. Build Log Entry with URL
+            # 4. Build Log Entry with URL
             log_entry = (
-                f"[{timestamp}] {status_icon} REQ ({i+1}/{len(targets)}): {report_name}\n"
+                f"[{timestamp}] {status_icon} REQ ({i+1}/{len(master_urls)}): {report_name}\n"
                 f"   ➡ Sending URL: {final_url}\n"
                 f"   ⬇ Status: {response.status_code}\n"
                 f"   ⬇ Reply:  {response_content}\n"
@@ -335,7 +294,7 @@ with gr.Blocks(theme=gr.themes.Soft()) as app:
         with gr.Column(scale=1):
             gr.Markdown("### 1. Target Configuration")
             with gr.Group():
-                link_input = gr.Textbox(label="TikTok Link", placeholder="https://www.tiktok.com/@username...")
+                link_input = gr.Textbox(label="TikTok Link for ID Resolution", placeholder="https://www.tiktok.com/@username...")
                 resolve_btn = gr.Button("🔍 Resolve IDs from Link", size="sm")
                 resolve_status = gr.Markdown("")
             
@@ -346,14 +305,21 @@ with gr.Blocks(theme=gr.themes.Soft()) as app:
             with gr.Row():
                 sec_uid_input = gr.Textbox(label="SecUID", info="Starts with MS4w...")
                 nick_input = gr.Textbox(label="Nickname", info="Username")
-
-            gr.Markdown("---")
-            gr.Markdown("### 2. Report Settings")
-            t1_input = gr.Dropdown(choices=get_type1_choices(), label="Category")
-            t2_input = gr.Dropdown(choices=[], label="Report Type")
             
-            send_btn = gr.Button("🚀 Send Report(s)", variant="primary", size="lg")
-            refresh_btn = gr.Button("🔄 Reload CSV", variant="secondary")
+            gr.Markdown("---")
+            gr.Markdown("### 2. Master URL Batch Input")
+            # NEW: Multi-line input for Master URLs
+            master_url_batch_input = gr.Textbox(
+                label="Master Signed Report URLs (One per line)", 
+                placeholder="Paste ONE OR MORE FULLY SIGNED & working report URLs here. (Profile, Video, or Comment reports).",
+                lines=5,
+                max_lines=10
+            )
+
+            # Removed Type 1/Type 2 selection as it's no longer used
+            # We keep the send button but link it to the new inputs
+            send_btn = gr.Button("🚀 Send Report Batch", variant="primary", size="lg")
+            refresh_btn = gr.Button("🔄 Reload CSV (Data not used)", variant="secondary")
 
         with gr.Column(scale=1):
             gr.Markdown("### 3. Execution Logs")
@@ -368,19 +334,19 @@ with gr.Blocks(theme=gr.themes.Soft()) as app:
 
     resolve_btn.click(fn=resolve_tiktok_link, inputs=link_input, outputs=[obj_id_input, own_id_input, sec_uid_input, nick_input, resolve_status])
     
-    def update_second_dropdown(choice):
-        new_choices = get_type2_choices(choice)
-        return gr.Dropdown(choices=new_choices, value=new_choices[0] if new_choices else None)
-
-    t1_input.change(fn=update_second_dropdown, inputs=t1_input, outputs=t2_input)
+    # We remove the dependency on the Type 1/Type 2 dropdowns
     
-    send_btn.click(fn=execute_reports, inputs=[t1_input, t2_input, obj_id_input, own_id_input, sec_uid_input, nick_input], outputs=logs_output)
+    send_btn.click(fn=execute_reports, 
+                   # Pass the new batch input, and the 4 ID inputs
+                   inputs=[master_url_batch_input, obj_id_input, own_id_input, sec_uid_input, nick_input], 
+                   outputs=logs_output)
     
+    # Keeping refresh button mostly for aesthetics, as CSV data is not relevant now
     def refresh_ui():
-        new_t1 = get_type1_choices()
-        return gr.Dropdown(choices=new_t1), gr.Dropdown(choices=[], value=None)
+        # Only refresh the dropdowns to reflect the simplified UI state
+        return gr.Dropdown(choices=["Manual URL Report"]), gr.Dropdown(choices=["Run Batch"], value="Run Batch")
         
-    refresh_btn.click(fn=refresh_ui, outputs=[t1_input, t2_input])
+    refresh_btn.click(fn=refresh_ui, outputs=[]) # No outputs to refresh the manual setup
 
 if __name__ == "__main__":
     app.launch()