Restore patch_extra.py to c6d2331

patch_extra.py

@@ -1,63 +1,49 @@
-"""Extra: highlight TikTok feed, single wall, clean rewrite, livescore CSS."""
+"""Extra CSS/JS fixes injected AFTER main PATCH_INJECT."""
 EXTRA_FIX = r'''
 <style>
+/* Force correct position for Short AI interaction buttons */
 .tiktok-slide{position:relative!important}
 .tiktok-right{position:absolute!important;right:8px!important;bottom:100px!important;display:flex!important;flex-direction:column!important;align-items:center!important;gap:14px!important;z-index:5!important}
 .tiktok-right-btn{display:flex!important;flex-direction:column!important;align-items:center!important;gap:2px!important;background:none!important;border:0!important;color:#fff!important;font-size:10px!important;cursor:pointer!important}
 .tiktok-right-btn .icon{width:42px!important;height:42px!important;border-radius:50%!important;background:rgba(255,255,255,.12)!important;display:flex!important;align-items:center!important;justify-content:center!important;font-size:20px!important}
 .tiktok-right-btn .count{font-size:10px!important;color:#ddd!important}
 #short-progress-toast{position:fixed;bottom:70px;left:50%;transform:translateX(-50%);background:#2d8659;color:#fff;padding:10px 20px;border-radius:20px;font-size:12px;z-index:99998;box-shadow:0 4px 12px rgba(0,0,0,.4);display:none;white-space:nowrap}
+/* Kill ALL duplicate short AI slides from old layers */
 #ai-short-home,.ai-short-home,.ai-short-card-final,[id*="ai-shorts-patched"]{display:none!important}
-/* Hide ALL duplicate Tường AI walls except the main one from loadHome */
-#ai-wall-topic-live,#ai-wall-final,[id*="ai-wall-patched"]{display:none!important}
-.ls-content{max-height:480px;overflow-y:auto;padding:0 6px 8px;font-size:12px;color:#ddd}.ls-content ul,.ls-content ol{list-style:none;padding:0;margin:0}.ls-content a{color:#5cb87a;text-decoration:none}.ls-content .matchs-league,.ls-content .league-group{list-style:none;padding:0;margin:0}.ls-content .title-content,.ls-content .league-title,.ls-content .group-title{display:flex;gap:6px;align-items:center;background:#222;border-radius:4px;margin:4px 0;padding:5px 8px}.ls-content .title-content img,.ls-content .league-title img{width:18px;height:18px;object-fit:contain}.ls-content .title-content strong,.ls-content .league-title strong{font-size:11px;color:#ccc}.ls-content .match-detail,.ls-content .match-item{padding:6px;border-bottom:1px solid #262626;cursor:pointer}.ls-content .match-detail:hover{background:#1a2a1f}.ls-content .match{display:flex;flex-wrap:wrap;align-items:center;gap:4px}.ls-content .datetime,.ls-content .match-time{width:100%;font-size:9px;color:#888}.ls-content .teams{display:flex;width:100%;align-items:center;gap:4px}.ls-content .team{flex:1;display:flex;align-items:center;gap:4px;min-width:0}.ls-content .team .name{font-size:11px;color:#ddd;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.ls-content .team .logo img{width:18px;height:18px}.ls-content .home-team{justify-content:flex-end;text-align:right}.ls-content .status{flex:0 0 54px;text-align:center}.ls-content .status a{color:#fff;text-decoration:none;font-weight:800;font-size:12px}.ls-content .status .label{font-size:8px;color:#888;display:block}.ls-content .status .label.live{color:#e74c3c}.ls-content .info,.ls-content .btns{display:none}.ls-content table,.mo-body table{width:100%;border-collapse:collapse;font-size:11px;color:#ccc}.ls-content table th,.mo-body table th{background:#222;color:#999;padding:5px 4px;font-size:10px;border-bottom:1px solid #333}.ls-content table td,.mo-body table td{padding:4px 3px;border-bottom:1px solid #1a1a1a}.ls-content table tr:hover td{background:#1a2a1f}.ls-content table .team-name,.mo-body table .team-name{display:flex;align-items:center;gap:4px}.ls-content table .team-name img,.mo-body table .team-name img{width:16px;height:16px}.ls-content table .pts{font-weight:800;color:#f0c040}.mo-body{padding:8px;font-size:12px;color:#ddd}.mo-body ul{list-style:none;padding:0;margin:0}.mo-body li{padding:5px 0;border-bottom:1px solid #222}.mo-body .stat-row{display:flex;align-items:center;gap:8px;padding:6px 0;border-bottom:1px solid #1f1f1f}.mo-body .stat-label{flex:1;text-align:center;font-size:11px;color:#999}.mo-body .stat-home{flex:1;text-align:right;font-weight:700;color:#eee}.mo-body .stat-away{flex:1;text-align:left;font-weight:700;color:#eee}
 </style>
 <div id="short-progress-toast"></div>
 <script>
 (function(){
-// Progress toast
+// Kill old renderers that create duplicate Short AI slides
+window.renderAIShortHome=function(){};
+window.renderAIShorts7=function(){};
+window.renderTopicWallE=function(){};
+window.renderAiShorts=function(){};
+// Also remove any already-rendered duplicate slides
+setInterval(function(){
+  document.querySelectorAll('#ai-short-home,.ai-short-home,[id*="ai-shorts-patched"]').forEach(function(el){el.remove()});
+},2000);
+// Progress toast for short creation
 window.showShortProgress=function(msg){var t=document.getElementById('short-progress-toast');if(t){t.textContent=msg;t.style.display='block';}};
 window.hideShortProgress=function(){var t=document.getElementById('short-progress-toast');if(t)t.style.display='none';};
+// Override makeShortFromPost to use progress toast
+var _origMakeShort=window.makeShortFromPost;
 window.makeShortFromPost=async function(pid,btn){
-  showShortProgress('⏳ Đang tạo Short AI...');if(btn){btn.disabled=true;btn.textContent='Đang tạo...';}
-  try{var r=await fetch('/api/ai/short/'+pid,{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({voice:'nu',emotion:'neutral',speed:1.2})});var j=await r.json();if(!r.ok||j.error)throw new Error(j.error||'Lỗi');showShortProgress('✅ Đã tạo Short AI!');setTimeout(hideShortProgress,3000);if(typeof renderShortAISlide==='function')renderShortAISlide();}catch(e){showShortProgress('❌ '+e.message);setTimeout(hideShortProgress,4000);}finally{if(btn){btn.disabled=false;btn.textContent='🎬 Tạo Short AI';}}
-};
-// Remove duplicate slides/walls
-setInterval(function(){document.querySelectorAll('#ai-short-home,.ai-short-home,[id*="ai-shorts-patched"],#ai-wall-topic-live,#ai-wall-final,[id*="ai-wall-patched"]').forEach(function(el){if(el.id!=='short-ai-final-slide')el.remove();});},3000);
-
-// === OVERRIDE openLeaguePlayer to use TikTok-style vertical feed (fullheight, interaction buttons) ===
-function esc(s){return String(s||'').replace(/[&<>"']/g,m=>({'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&#39;'}[m]));}
-window.openLeaguePlayer=async function(league,idx){
-  showView('view-tiktok');document.querySelectorAll('.cat').forEach(x=>x.classList.remove('active'));
-  const el=document.getElementById('view-tiktok');el.innerHTML='<div class="loading">Đang tải highlight...</div>';
-  const HL_CONFIG=window.HL_CONFIG||{"premier-league":{name:"Premier League",emoji:"🏴"},"champions-league":{name:"Champions League",emoji:"⭐"},"la-liga":{name:"La Liga",emoji:"🇪🇸"},"serie-a":{name:"Serie A",emoji:"🇮🇹"},"bundesliga":{name:"Bundesliga",emoji:"🇩🇪"}};
-  const cfg=HL_CONFIG[league]||{name:league,emoji:'🎬'};
-  const articles=(window._hlLeagueData||{})[league]||[];
-  if(!articles.length){el.innerHTML='<div class="loading">Không có video</div>';return;}
-  // Fetch video URLs
-  const vids=[];
-  const results=await Promise.all(articles.map(async(a,i)=>{try{const r=await fetch('/api/video_url?url='+encodeURIComponent(a.link));const v=await r.json();if(v&&v.src)return{...a,...v,_idx:i};}catch(e){}return null;}));
-  results.forEach(r=>{if(r)vids.push(r);});
-  vids.sort((a,b)=>a._idx-b._idx);
-  if(!vids.length){el.innerHTML='<div class="loading">Không tìm thấy video</div>';return;}
-  let ti=vids.findIndex(v=>v._idx===idx);if(ti<0)ti=0;
-  const ordered=ti>0?[...vids.slice(ti),...vids.slice(0,ti)]:vids;
-  // Build TikTok-style feed (same as shorts)
-  let h=`<button class="back-btn" onclick="switchCat('home')">← ${cfg.emoji} ${cfg.name}</button><div class="tiktok-container"><div class="tiktok-feed" id="tiktok-feed">`;
-  ordered.forEach((v,i)=>{
-    const isYT=v.type==='youtube';const isHLS=!isYT&&v.src&&v.src.includes('.m3u8');
-    const poster=v.poster?' poster="'+v.poster+'"':'';
-    const vtag=isYT?`<iframe data-yt-src="${v.src}" allowfullscreen allow="accelerometer;autoplay;clipboard-write;encrypted-media;gyroscope;picture-in-picture" style="width:100%;height:100%;border:none"></iframe>`:isHLS?`<video playsinline preload="none"${poster} data-hls="${v.src}" loop controls></video>`:`<video playsinline preload="none"${poster} loop controls><source src="${v.src}" type="video/mp4"></video>`;
-    h+=`<div class="tiktok-slide" id="tslide-${i}" data-id="hl-${i}"><${vtag.startsWith('<iframe')?'':''}${vtag}<div class="tiktok-bottom"><span class="badge badge-fpt">${esc(cfg.name)}</span><p class="tiktok-title">${esc(v.title)}</p></div><div class="tiktok-right"><button class="tiktok-right-btn" onclick="event.stopPropagation()"><div class="icon">👁</div></button><button class="tiktok-right-btn" onclick="event.stopPropagation()"><div class="icon">❤️</div></button><button class="tiktok-right-btn" onclick="event.stopPropagation();if(typeof doShareVideo==='function')doShareVideo('${esc(v.title)}','${esc(v.link||'')}','${esc(v.poster||v.img||'')}','highlights')"><div class="icon">📤</div></button></div><span class="tiktok-counter">${i+1}/${ordered.length}</span></div>`;
-  });
-  h+='</div></div>';el.innerHTML=h;
-  // Init feed (same logic as shorts)
-  const feed=document.getElementById('tiktok-feed');if(!feed)return;
-  const slides=feed.querySelectorAll('.tiktok-slide');let cur=-1;
-  function act(i){if(i===cur)return;slides.forEach((sl,idx)=>{const v=sl.querySelector('video');const fr=sl.querySelector('iframe');if(idx===i){if(v&&v.dataset.hls){if(!v._hls&&typeof Hls!=='undefined'&&Hls.isSupported()){const hls=new Hls();hls.loadSource(v.dataset.hls);hls.attachMedia(v);hls.on(Hls.Events.MANIFEST_PARSED,()=>v.play().catch(()=>{}));v._hls=hls;}else if(v._hls)v.play().catch(()=>{});}else if(v)v.play().catch(()=>{});if(fr&&!fr.src&&fr.dataset.ytSrc)fr.src=fr.dataset.ytSrc;}else{if(v){v.pause();if(v._hls){v._hls.destroy();v._hls=null;}}if(fr&&fr.src)fr.src='';}});cur=i;}
-  let sT;feed.addEventListener('scroll',()=>{clearTimeout(sT);sT=setTimeout(()=>{const rect=feed.getBoundingClientRect(),ctr=rect.top+rect.height/2;let best=-1,bestD=1e9;slides.forEach((sl,i)=>{const d=Math.abs(sl.getBoundingClientRect().top+sl.getBoundingClientRect().height/2-ctr);if(d<bestD){bestD=d;best=i;}});if(best>=0)act(best);},150);});
-  setTimeout(()=>act(0),400);
-  slides.forEach(sl=>{const v=sl.querySelector('video');if(v)v.addEventListener('click',e=>{e.preventDefault();v.paused?v.play().catch(()=>{}):v.pause();});});
+  showShortProgress('⏳ Đang tạo Short AI...');
+  if(btn){btn.disabled=true;btn.textContent='Đang tạo...';}
+  try{
+    var r=await fetch('/api/ai/short/'+pid,{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({voice:'nu',emotion:'neutral',speed:1.2})});
+    var j=await r.json();
+    if(!r.ok||j.error)throw new Error(j.error||'Lỗi');
+    showShortProgress('✅ Đã tạo Short AI!');
+    setTimeout(hideShortProgress,3000);
+    if(typeof renderShortAISlide==='function')renderShortAISlide();
+  }catch(e){
+    showShortProgress('❌ Lỗi: '+e.message);
+    setTimeout(hideShortProgress,4000);
+  }finally{
+    if(btn){btn.disabled=false;btn.textContent='🎬 Tạo Short AI';}
+  }
 };
 })();
 </script>