Update app.py

app.py

@@ -142,16 +142,36 @@ RAW_USERNAMES = os.getenv("RAW_USERNAMES", "").split(",")
 REACTED_USERNAMES = os.getenv("REACTED_USERNAMES", "").split(",")
 
 
+import os
+import json
+import time
+import random
+import pathlib
+import requests
+from typing import Optional, Tuple
+from telethon.tl.functions.messages import GetHistoryRequest
+
+# Constants
+IG_HEADERS = {
+    "User-Agent": "Mozilla/5.0",
+    # Optional: Uncomment if using sessionid
+    # "Cookie": f"sessionid={os.getenv('IG_SESSION_ID')}"
+}
+
 def get_user_id(username: str) -> Optional[str]:
     try:
         res = requests.get(
             f"https://www.instagram.com/api/v1/users/web_profile_info/?username={username}",
+            headers=IG_HEADERS,
             timeout=10
         )
         if res.status_code == 200:
-            return res.json()["data"]["user"]["id"]
-    except:
-        pass
+            user_id = res.json()["data"]["user"]["id"]
+            logger.info(f"[🆔] Got user ID for @{username}: {user_id}")
+            return user_id
+        logger.warning(f"[⚠️] Failed to get user ID for @{username}, status {res.status_code}")
+    except Exception as e:
+        logger.warning(f"[❌] get_user_id({username}) error: {e}")
     return None
 
 def get_links(user_id: str, limit: int = 5) -> list[Tuple[str, str]]:
@@ -171,8 +191,9 @@ def get_links(user_id: str, limit: int = 5) -> list[Tuple[str, str]]:
         }
 
         try:
-            res = requests.get("https://www.instagram.com/graphql/query/", params=params, timeout=10)
+            res = requests.get("https://www.instagram.com/graphql/query/", params=params, headers=IG_HEADERS, timeout=10)
             if res.status_code != 200:
+                logger.warning(f"[⚠️] Failed to get links for user {user_id}, status {res.status_code}")
                 break
 
             media = res.json()["data"]["user"]["edge_owner_to_timeline_media"]
@@ -187,47 +208,60 @@ def get_links(user_id: str, limit: int = 5) -> list[Tuple[str, str]]:
             if not media["page_info"]["has_next_page"]:
                 break
             end_cursor = media["page_info"]["end_cursor"]
-        except:
+        except Exception as e:
+            logger.warning(f"[❌] get_links() error: {e}")
             break
+    logger.info(f"[🔗] Found {len(links)} links for user ID {user_id}")
     return links
 
 def send_to_bot_and_get_video(link: str) -> Optional[str]:
-    entity = client.loop.run_until_complete(client.get_entity("instasavegrambot"))
-    client.loop.run_until_complete(client.send_message(entity, link))
-
-    for _ in range(15):  # Wait up to 30s
-        time.sleep(2)
-        history = client.loop.run_until_complete(
-            client(GetHistoryRequest(
-                peer=entity,
-                limit=2,
-                offset_id=0,
-                offset_date=None,
-                add_offset=0,
-                max_id=0,
-                min_id=0,
-                hash=0
-            ))
-        )
-        for msg in history.messages:
-            if msg.video and 20 <= msg.video.duration <= 180:
-                path = f"reels/{msg.id}.mp4"
-                pathlib.Path("reels").mkdir(exist_ok=True)
-                client.loop.run_until_complete(msg.download_media(file=path))
-                return path
+    try:
+        entity = client.loop.run_until_complete(client.get_entity("instasavegrambot"))
+        client.loop.run_until_complete(client.send_message(entity, link))
+
+        for _ in range(15):  # Wait up to 30s
+            time.sleep(2)
+            history = client.loop.run_until_complete(
+                client(GetHistoryRequest(
+                    peer=entity,
+                    limit=2,
+                    offset_id=0,
+                    offset_date=None,
+                    add_offset=0,
+                    max_id=0,
+                    min_id=0,
+                    hash=0
+                ))
+            )
+            for msg in history.messages:
+                logger.info(f"[📨] Bot message: {msg.message or '[media]'}")
+                if msg.video and 20 <= msg.video.duration <= 180:
+                    path = f"reels/{msg.id}.mp4"
+                    pathlib.Path("reels").mkdir(exist_ok=True)
+                    client.loop.run_until_complete(msg.download_media(file=path))
+                    logger.info(f"[✅] Downloaded reel to {path}")
+                    return path
+    except Exception as e:
+        logger.warning(f"[❌] send_to_bot_and_get_video error: {e}")
     return None
 
 def fetch_valid_reel() -> Tuple[Optional[str], Optional[str]]:
     with client:
         pools = [(RAW_USERNAMES, "raw"), (REACTED_USERNAMES, "reacted")]
         pools = [(p, t) for p, t in pools if p]
+        if not pools:
+            logger.warning("[⚠️] No usernames in either RAW or REACTED pools.")
+            return None, None
+
         random.shuffle(pools)
 
         for usernames, reel_type in pools:
             random.shuffle(usernames)
             for username in usernames:
+                logger.info(f"[🔎] Trying @{username} ({reel_type})")
                 uid = get_user_id(username)
                 if not uid:
+                    logger.warning(f"[🚫] Skipping @{username}, failed to get user ID.")
                     continue
 
                 fetch_idx = get_next_fetch_index(username)
@@ -235,10 +269,13 @@ def fetch_valid_reel() -> Tuple[Optional[str], Optional[str]]:
 
                 for idx, (reel_id, link) in enumerate(links[fetch_idx:], start=fetch_idx):
                     if is_reel_fetched_or_skipped(username, reel_id):
+                        logger.info(f"[⏩] Already processed: @{username}/{reel_id}")
                         continue
 
+                    logger.info(f"[📥] Sending link to bot: {link}")
                     video_path = send_to_bot_and_get_video(link)
                     if not video_path:
+                        logger.warning(f"[⚠️] Failed to fetch: {link}")
                         mark_reel_skipped(username, reel_id)
                         continue
 
@@ -248,6 +285,7 @@ def fetch_valid_reel() -> Tuple[Optional[str], Optional[str]]:
 
                 update_fetch_index(username, fetch_idx + len(links))
 
+    logger.warning("[🚫] No valid reels found after checking all usernames.")
     return None, None
                                             
 def patch_moviepy():