Upload app.py

app.py

@@ -320,6 +320,39 @@ def api_cookie_check():
         'keys': keys,
     })
 
+def get_latest_youtube_video(channel_id):
+    """Use yt-dlp to get latest video ID & title — bypasses RSS cache delay"""
+    try:
+        cmd = [
+            'yt-dlp',
+            '--flat-playlist',
+            '--playlist-end', '1',
+            '--print', '%(id)s|||%(title)s',
+            f'https://www.youtube.com/channel/{channel_id}/videos'
+        ]
+        if os.path.exists(COOKIES_FILE):
+            cmd = ['yt-dlp', '--cookies', COOKIES_FILE,
+                   '--flat-playlist', '--playlist-end', '1',
+                   '--print', '%(id)s|||%(title)s',
+                   f'https://www.youtube.com/channel/{channel_id}/videos']
+
+        result = subprocess.run(cmd, capture_output=True, text=True, timeout=60)
+        if result.returncode == 0 and result.stdout.strip():
+            line = result.stdout.strip().splitlines()[0]
+            parts = line.split('|||', 1)
+            if len(parts) == 2:
+                vid_id = parts[0].strip()
+                title  = parts[1].strip()
+                if vid_id:
+                    return vid_id, title
+        add_log(f'⚠️ yt-dlp stderr: {result.stderr[:200]}')
+    except subprocess.TimeoutExpired:
+        add_log('⚠️ yt-dlp channel check timed out')
+    except Exception as e:
+        add_log(f'⚠️ yt-dlp channel check error: {e}')
+    return None, None
+
+
 def auto_poster_worker():
     global bot_running
     add_log('🤖 Auto Poster started')
@@ -328,28 +361,24 @@ def auto_poster_worker():
 
     while bot_running:
         try:
-            import feedparser
-            feed_url = f'https://www.youtube.com/feeds/videos.xml?channel_id={CHANNEL_ID}'
-            feed = feedparser.parse(feed_url)
-
-            if feed.entries:
-                latest   = feed.entries[0]
-                video_id = latest.get('yt_videoid', '')
-                title    = latest.get('title', '')
-
-                if last_id is None:
-                    last_id = video_id
-                    add_log(f'📌 Initialized. Latest: {video_id} — {title[:40]}')
-                elif video_id != last_id:
-                    add_log(f'📹 New video detected: {title[:50]}')
-                    video_path = download_video(f'https://youtube.com/watch?v={video_id}', '720')
-                    if video_path:
-                        upload_to_tiktok(video_path, title)
-                        try: os.remove(video_path)
-                        except: pass
-                    last_id = video_id
-                else:
-                    add_log(f'💤 No new video. Last: {video_id}')
+            video_id, title = get_latest_youtube_video(CHANNEL_ID)
+
+            if not video_id:
+                add_log('⚠️ Could not fetch latest video — retrying next cycle')
+            elif last_id is None:
+                last_id = video_id
+                add_log(f'📌 Initialized. Latest: {video_id} — {title[:40]}')
+            elif video_id != last_id:
+                add_log(f'📹 New video detected: {title[:50]}')
+                video_path = download_video(f'https://youtube.com/watch?v={video_id}', '720')
+                if video_path:
+                    upload_to_tiktok(video_path, title)
+                    try: os.remove(video_path)
+                    except: pass
+                last_id = video_id
+            else:
+                add_log(f'💤 No new video. Last: {video_id}')
+
         except Exception as e:
             add_log(f'⚠️ Worker error: {e}')