fix: multi-part videos + slider click opens correct video in TikTok feed

app_wrapper.py

@@ -18,7 +18,6 @@ SHORTS_EXTRA_CSS = """
 .tiktok-fullheight-btn.active{background:rgba(92,184,122,.5)}
 """
 
-# Kill ALL padding at every Gradio container level
 FULLWIDTH_CSS = """
 /* ══ FULLWIDTH: kill all Gradio padding ══ */
 body,.gradio-container,.main,.contain{margin:0!important;padding:0!important;max-width:100%!important;width:100%!important}
@@ -28,11 +27,8 @@ body,.gradio-container,.main,.contain{margin:0!important;padding:0!important;max
 .gradio-container>.main>.contain>div>div{padding:0!important}
 #component-0,#component-1,#component-2,#component-3,#component-4,#component-5{padding:0!important;margin:0!important}
 .gap{gap:0!important}
-.panel{padding:0!important}
-.form{padding:0!important}
-.block{padding:0!important}
+.panel,.form,.block{padding:0!important}
 div[class*="svelte"]{padding-left:0!important;padding-right:0!important}
-/* Content areas get minimal padding */
 .bdp-wrap{padding:6px 4px!important}
 .bdp-article{padding:12px 8px 30px!important;max-width:100%!important}
 .controls-row{padding:0 4px!important}
@@ -52,6 +48,29 @@ if "shorts-feed-mode" not in app.CSS:
 if "FULLWIDTH: kill all Gradio padding" not in app.CSS:
     app.CSS += FULLWIDTH_CSS
 
+# ══ Patch homepage slider: change bdpOpenTikTok to bdpOpen for highlight videos ══
+# The homepage slider uses render_video_slider_html which calls bdpOpenTikTok
+# But bdpOpenTikTok is broken/dead. Change it to bdpOpen so clicking a highlight
+# opens the article (which for 24h URLs renders as TikTok feed via our read_article patch)
+_orig_render_video_slider = getattr(app, 'render_video_slider_html', None)
+if _orig_render_video_slider:
+    def _patched_render_video_slider(videos):
+        html = _orig_render_video_slider(videos)
+        # Replace bdpOpenTikTok with bdpOpen (add slug param)
+        # bdpOpenTikTok('url','aid') → bdpOpen('url','aid','')
+        html = html.replace("window.bdpOpenTikTok(", "window.bdpOpen(")
+        # Fix: bdpOpen needs 3 params (url, aid, slug). Add empty slug where missing.
+        import re as _r
+        def _fix_bdpopen(m):
+            # If only 2 params, add third empty one
+            params = m.group(1)
+            if params.count(",") < 2:
+                params = params.rstrip(")") + ",''"
+            return "window.bdpOpen(" + params + ")"
+        html = _r.sub(r"window\.bdpOpen\(([^)]+)\)", _fix_bdpopen, html)
+        return html
+    app.render_video_slider_html = _patched_render_video_slider
+
 # ══ Patch render_homepage_html: add shorts carousel ══
 _orig_render_homepage = app.render_homepage_html
 def _patched_render_homepage(articles, *args, **kwargs):
@@ -72,23 +91,70 @@ def _patched_render_homepage(articles, *args, **kwargs):
     return html
 app.render_homepage_html = _patched_render_homepage
 
-# ══ Patch render_video_page_html: fullheight button + ensure multi-part ══
+# ══ Patch fetch_tiktok_feed_videos: ensure multi-part 24h videos create multiple slides ══
+_orig_fetch_tiktok = app.fetch_tiktok_feed_videos
+def _patched_fetch_tiktok():
+    """Override to ensure multi-part 24h videos are fully expanded."""
+    from concurrent.futures import ThreadPoolExecutor, as_completed
+    results = []
+
+    def _fetch_bdp_vid(art):
+        vid_id = app._extract_bdp_video_id(art["link"])
+        if not vid_id: return None
+        embed = app.fetch_bdp_embed_data(vid_id)
+        if not embed or not embed.get("mp4"): return None
+        return [{"title": art["title"], "src": embed["mp4"], "poster": embed.get("poster",""),
+                "vtype": "mp4", "source": "bdp", "link": art["link"]}]
+
+    def _fetch_24h_vid(art):
+        # Use the PLURAL version that probes for 02, 03, etc.
+        vids = app._extract_24h_video_urls(art["link"])
+        if not vids: return []
+        out = []
+        for pi, v in enumerate(vids):
+            label = f" (Phần {pi+1})" if len(vids) > 1 else ""
+            out.append({"title": art["title"] + label, "src": v["src"], "poster": v["poster"],
+                "vtype": v["vtype"], "source": "24h", "link": art["link"]})
+        return out
+
+    bdp_list = app.scrape_bdp_video_list()[:12]
+    h24_list = app.scrape_24h_video_list()[:12]
+
+    bdp_results, h24_results = [], []
+    with ThreadPoolExecutor(max_workers=8) as ex:
+        bdp_futures = {ex.submit(_fetch_bdp_vid, a): a for a in bdp_list}
+        h24_futures = {ex.submit(_fetch_24h_vid, a): a for a in h24_list}
+        for f in as_completed(bdp_futures):
+            try:
+                r = f.result()
+                if r: bdp_results.extend(r)
+            except: pass
+        for f in as_completed(h24_futures):
+            try:
+                r = f.result()
+                if r: h24_results.extend(r)
+            except: pass
+
+    # Interleave
+    bi, hi = 0, 0
+    while bi < len(bdp_results) or hi < len(h24_results):
+        if bi < len(bdp_results):
+            results.append(bdp_results[bi]); bi += 1
+        if hi < len(h24_results):
+            results.append(h24_results[hi]); hi += 1
+    return results[:25]
+
+app.fetch_tiktok_feed_videos = _patched_fetch_tiktok
+
+# ══ Patch render_video_page_html: fullheight button ══
 _orig_render_video_page = app.render_video_page_html
 def _patched_render_video_page():
     html = _orig_render_video_page()
-    # Add fullheight toggle button in each highlight slide
     toggle_btn = '<button class="tiktok-fullheight-btn" onclick="event.stopPropagation();var c=this.closest(\'.tiktok-fullscreen-container\');c.classList.toggle(\'fullheight-mode\');var on=c.classList.contains(\'fullheight-mode\');c.querySelectorAll(\'.tiktok-fullheight-btn\').forEach(function(b){b.classList.toggle(\'active\',on);b.textContent=on?\'\\u2B07 Contain\':\'\\u2922 Fullheight\';});">\u2922 Fullheight</button>'
     html = html.replace('<div class="tiktok-unmute-hint"', toggle_btn + '<div class="tiktok-unmute-hint"')
     return html
 app.render_video_page_html = _patched_render_video_page
 
-# ══ Ensure _fetch_24h_vid in fetch_tiktok_feed_videos creates multiple slides per multi-part article ══
-# The app.py already has _extract_24h_video_urls which probes 02, 03 etc.
-# And _fetch_24h_vid returns a list when multiple parts found.
-# Verify this is working by checking the function exists:
-if hasattr(app, '_extract_24h_video_urls'):
-    print("[app_wrapper] Multi-part 24h extraction confirmed available")
-
 # ══ Patch read_article: 24h URLs → shorts TikTok feed ══
 _orig_read_article = app.read_article
 def _patched_read_article(url):
@@ -101,7 +167,7 @@ def _patched_read_article(url):
     return _orig_read_article(url)
 
 def _render_shorts_tiktok_feed(current_url):
-    """Render shorts as TikTok feed using SAME classes as highlight TikTok."""
+    """Render shorts/24h article as TikTok feed with ALL videos from shorts list."""
     from concurrent.futures import ThreadPoolExecutor, as_completed
 
     try:
@@ -113,11 +179,21 @@ def _render_shorts_tiktok_feed(current_url):
         return None
 
     def _fetch_video(art):
-        vid = _extract_24h_video_url(art["link"])
-        if vid:
-            return {"title": art["title"], "link": art["link"], "img": art.get("img",""),
-                    "src": vid["src"], "poster": vid["poster"], "vtype": vid["vtype"]}
-        return None
+        # Use plural version to get all parts
+        vids = app._extract_24h_video_urls(art["link"])
+        if not vids:
+            # Fallback to singular
+            vid = _extract_24h_video_url(art["link"])
+            if vid:
+                vids = [vid]
+        if not vids:
+            return []
+        out = []
+        for pi, v in enumerate(vids):
+            label = f" (Phần {pi+1})" if len(vids) > 1 else ""
+            out.append({"title": art["title"] + label, "link": art["link"], "img": art.get("img",""),
+                    "src": v["src"], "poster": v["poster"], "vtype": v["vtype"]})
+        return out
 
     videos = []
     with ThreadPoolExecutor(max_workers=6) as ex:
@@ -125,18 +201,19 @@ def _render_shorts_tiktok_feed(current_url):
         for f in as_completed(futures):
             try:
                 r = f.result()
-                if r: videos.append(r)
+                if r: videos.extend(r)
             except: pass
 
     if not videos:
         return None
 
+    # Reorder: clicked video (and its parts) first
     current_aid = app.make_id(current_url)
     ordered = []
     rest = []
     for v in videos:
         if app.make_id(v["link"]) == current_aid:
-            ordered.insert(0, v)
+            ordered.append(v)
         else:
             rest.append(v)
     ordered.extend(rest)