VNEWS

Running

App Files Files Community

bep40 commited on May 8

Commit

c8e389b

verified ·

1 Parent(s): ba46f0a

fix share: redirect via ?open= query param (no localStorage), fix comment: click outside closes panel

Browse files

Files changed (1) hide show

main.py +6 -9

main.py CHANGED Viewed

@@ -107,10 +107,7 @@ def scrape_24h_highlights():
             arts.append({"title":title,"link":href,"img":img_src,"source":"24h"})
         def _og(art):
             if art["img"]:return
-            try:
-                r=requests.get(art["link"],headers=HEADERS,timeout=8);r.encoding="utf-8"
-                og=BeautifulSoup(r.text,"lxml").find("meta",property="og:image")
-                if og:art["img"]=og.get("content","")
             except:pass
         need=[a for a in arts if not a["img"]][:10]
         if need:
@@ -128,8 +125,7 @@ def scrape_24h_shorts():
             href=a.get("href","")
             if not href.startswith("http"):href=BASE_24H+href
             if href in seen:continue
-            img_tag=art.find("img")
-            title=(img_tag.get("alt","") if img_tag else "") or a.get("title","") or a.get_text(strip=True)
             if not title or len(title)<10:continue
             img_src=""
             if img_tag:img_src=img_tag.get("data-original") or img_tag.get("data-src") or img_tag.get("src","")
@@ -296,12 +292,13 @@ def api_article(url:str=Query(...)):
     else:data=None
     return JSONResponse(data if data else{"error":"not supported"})
-# Share page: SEO with og:image + redirect to article
 @app.get("/s")
 async def share_redirect(url:str=Query(default=""),title:str=Query(default="VNEWS"),img:str=Query(default="")):
     og_image=unquote(img) if img else "https://s1.vnecdn.net/vnexpress/restruct/i/v9505/logo_default.jpg"
     decoded_url=unquote(url)
-    redirect_script=f'<script>localStorage.setItem("pending_article","{decoded_url}");location.href="{SPACE_URL}";</script>' if decoded_url else f'<script>location.href="{SPACE_URL}";</script>'
     return HTMLResponse(f'''<!DOCTYPE html><html><head>
 <meta charset="utf-8"><title>{unquote(title)}</title>
 <meta property="og:title" content="{unquote(title)}">
@@ -313,7 +310,7 @@ async def share_redirect(url:str=Query(default=""),title:str=Query(default="VNEW
 <meta name="twitter:card" content="summary_large_image">
 <meta name="twitter:title" content="{unquote(title)}">
 <meta name="twitter:image" content="{og_image}">
-</head><body>{redirect_script}</body></html>''')
 @app.get("/")
 async def index():

             arts.append({"title":title,"link":href,"img":img_src,"source":"24h"})
         def _og(art):
             if art["img"]:return
+            try:r=requests.get(art["link"],headers=HEADERS,timeout=8);r.encoding="utf-8";og=BeautifulSoup(r.text,"lxml").find("meta",property="og:image");art["img"]=og.get("content","") if og else ""
             except:pass
         need=[a for a in arts if not a["img"]][:10]
         if need:
             href=a.get("href","")
             if not href.startswith("http"):href=BASE_24H+href
             if href in seen:continue
+            img_tag=art.find("img");title=(img_tag.get("alt","") if img_tag else "") or a.get("title","") or a.get_text(strip=True)
             if not title or len(title)<10:continue
             img_src=""
             if img_tag:img_src=img_tag.get("data-original") or img_tag.get("data-src") or img_tag.get("src","")
     else:data=None
     return JSONResponse(data if data else{"error":"not supported"})
+# Share page: SEO og:image for crawlers. Redirect users via ?open= query param (NOT localStorage)
 @app.get("/s")
 async def share_redirect(url:str=Query(default=""),title:str=Query(default="VNEWS"),img:str=Query(default="")):
     og_image=unquote(img) if img else "https://s1.vnecdn.net/vnexpress/restruct/i/v9505/logo_default.jpg"
     decoded_url=unquote(url)
+    # Redirect to /?open=ENCODED_URL — frontend reads query param directly (no localStorage needed)
+    redirect_target=f"{SPACE_URL}/?open={quote(decoded_url,'')}" if decoded_url else SPACE_URL
     return HTMLResponse(f'''<!DOCTYPE html><html><head>
 <meta charset="utf-8"><title>{unquote(title)}</title>
 <meta property="og:title" content="{unquote(title)}">
 <meta name="twitter:card" content="summary_large_image">
 <meta name="twitter:title" content="{unquote(title)}">
 <meta name="twitter:image" content="{og_image}">
+</head><body><script>window.location.replace("{redirect_target}");</script></body></html>''')
 @app.get("/")
 async def index():