Override root to add fast hashtag UI + topic input same flow"

app_run.py

@@ -1,16 +1,101 @@
-"""Wrapper over app_final: faster hashtag sources + topic input same flow."""
+"""Wrapper: faster hashtag + spinner + topic input same flow."""
 from app_final import *
-from app_final import app, f6, HIGHLIGHT_FULL_OVERRIDE
-from fastapi.responses import JSONResponse
+from app_final import app, f6, f5, rt, PATCH_INJECT, UNIFIED_INJECT_FIXED, HIGHLIGHT_FULL_OVERRIDE, EXTRA_WALL_FIX
+from fastapi.responses import HTMLResponse, JSONResponse
 from fastapi import Query
 
-# Override /api/hashtag/sources to NOT scrape og:image (fast response)
-app.router.routes=[r for r in app.router.routes if not (getattr(r,'path',None)=='/api/hashtag/sources' and 'GET' in getattr(r,'methods',set()))]
+# Override /api/hashtag/sources — NO og:image scrape, instant from RSS cache
+app.router.routes=[r for r in app.router.routes if not (
+    (getattr(r,'path',None)=='/api/hashtag/sources' and 'GET' in getattr(r,'methods',set())) or
+    (getattr(r,'path',None)=='/' and 'GET' in getattr(r,'methods',set()))
+)]
 
 @app.get('/api/hashtag/sources')
 def _hashtag_fast(topic:str=Query(...)):
-    """Return sources FAST — only title/url/via from RSS cache. No og:image scrape."""
     research=f6._fast_context(topic) if hasattr(f6,'_fast_context') else f6._web_research_context(topic)
     sources=research.get('sources',[])
-    # Return immediately without scraping images — frontend will lazy-load them
     return JSONResponse({'sources':[{'title':s.get('title',''),'url':s.get('url',''),'via':s.get('via',s.get('source','')),'snippet':s.get('snippet',s.get('excerpt',''))[:200]} for s in sources[:8]],'topic':topic})
+
+# Extra JS: override showHashtagSources with spinner + lazy img + topic input integration
+FAST_HASHTAG_JS = r'''
+<style>
+.hashtag-loading{display:flex;align-items:center;gap:8px;padding:12px;color:#888;font-size:12px}
+.hashtag-spinner{width:16px;height:16px;border:2px solid #333;border-top-color:#5cb87a;border-radius:50%;animation:ht-spin .8s linear infinite}
+@keyframes ht-spin{to{transform:rotate(360deg)}}
+.hashtag-src-item img{width:100%;height:100%;object-fit:cover}
+</style>
+<script>
+(function(){
+function esc(s){return String(s||'').replace(/[&<>"']/g,function(m){return{'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&#39;'}[m]});}
+
+// Override showHashtagSources: spinner + lazy image from /api/article
+window.showHashtagSources=async function(topic){
+  var home=document.getElementById('view-home');if(!home)return;
+  document.getElementById('hashtag-sources-box')?.remove();
+  var box=document.createElement('div');box.id='hashtag-sources-box';box.className='hashtag-sources';
+  box.innerHTML='<h3>🔍 '+esc(topic)+'</h3><div class="hashtag-loading"><div class="hashtag-spinner"></div>Đang tìm nguồn nhanh...</div>';
+  var compose=home.querySelector('.ai-compose');
+  if(compose)compose.after(box);else home.prepend(box);
+  box.scrollIntoView({behavior:'smooth',block:'start'});
+  try{
+    var r=await fetch('/api/hashtag/sources?topic='+encodeURIComponent(topic));
+    var j=await r.json();var sources=j.sources||[];
+    if(!sources.length){box.innerHTML='<h3>🔍 '+esc(topic)+'</h3><div style="color:#888;font-size:12px;padding:8px">Không tìm được nguồn cho chủ đề này</div>';return;}
+    var h='<h3>🔍 '+esc(topic)+' <span style="font-size:10px;color:#888">('+sources.length+' nguồn)</span></h3>';
+    sources.forEach(function(s,i){
+      h+='<div class="hashtag-src-item" onclick="if(typeof readArticle===\'function\')readArticle(\''+esc(s.url||'')+'\')">';
+      h+='<div class="hashtag-src-img" id="ht-img-'+i+'"></div>';
+      h+='<div class="hashtag-src-text"><div class="hashtag-src-title">'+esc(s.title)+'</div><div class="hashtag-src-via">'+esc(s.via||'')+'</div>'+(s.snippet?'<div style="font-size:10px;color:#999;margin-top:2px;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;overflow:hidden">'+esc(s.snippet)+'</div>':'')+'</div>';
+      h+='</div>';
+    });
+    h+='<button class="hashtag-rewrite-btn" onclick="rewriteHashtagTopic(\''+esc(topic)+'\')">🤖 Rewrite AI tổng hợp nguồn & đăng tường</button>';
+    box.innerHTML=h;
+    // Lazy load images from /api/article (non-blocking)
+    sources.forEach(function(s,i){
+      if(!s.url)return;
+      fetch('/api/article?url='+encodeURIComponent(s.url)).then(function(r){return r.json()}).then(function(d){
+        if(d&&(d.og_image||d.img)){
+          var el=document.getElementById('ht-img-'+i);
+          if(el)el.innerHTML='<img src="'+esc(d.og_image||d.img)+'" onerror="this.style.display=\'none\'" loading="lazy">';
+        }
+      }).catch(function(){});
+    });
+  }catch(e){box.innerHTML='<h3>🔍 '+esc(topic)+'</h3><div style="color:#e74c3c;font-size:12px;padding:8px">Lỗi: '+esc(e.message)+'</div>';}
+};
+
+// Override topic input button to use same flow (show sources first)
+window.createTopicPost=function(){
+  var inp=document.getElementById('ai-topic-input');
+  var topic=(inp&&inp.value||'').trim();
+  if(!topic){alert('Nhập chủ đề trước');return;}
+  showHashtagSources(topic);
+  if(inp)inp.value='';
+};
+
+// Override the final5 topic button too
+window.createTopicPostFinal5=function(){
+  var inp=document.getElementById('ai-topic-input-final5')||document.getElementById('ai-topic-input');
+  var topic=(inp&&inp.value||'').trim();
+  if(!topic){alert('Nhập chủ đề trước');return;}
+  showHashtagSources(topic);
+  if(inp)inp.value='';
+};
+})();
+</script>
+'''
+
+@app.get('/')
+async def _index_run():
+    html=f5.f4.f3.f2.f1._load_index_html()
+    body=''
+    body+=getattr(rt.old,'PATCH_INJECT','')
+    body+=f5.f4.f3.f2.f1.FINAL_INJECT+f5.f4.f3.FINAL3_INJECT+f5.f4.FINAL4_INJECT+f5.FINAL5_INJECT
+    body+=getattr(f6,'FINAL6_INJECT','')
+    body+=getattr(f6,'FINAL6_FAST_HOME_INJECT','')
+    body+=getattr(f6,'FINAL6E_INJECT','')
+    body+=PATCH_INJECT
+    body+=UNIFIED_INJECT_FIXED
+    body+=HIGHLIGHT_FULL_OVERRIDE
+    body+=EXTRA_WALL_FIX
+    body+=FAST_HASHTAG_JS  # Last: overrides showHashtagSources and createTopicPost
+    return HTMLResponse(html.replace('</body>',body+'\n</body>') if '</body>' in html else html+body)