Update app/gscode_logic.py

app/gscode_logic.py

@@ -1,6 +1,7 @@
 # gscode_logic.py
 import aiohttp
 from bs4 import BeautifulSoup
+from typing import List, Dict
 
 GENSHIN_API = (
     "https://genshin-impact.fandom.com/api.php"
@@ -16,57 +17,64 @@ class GenshinCodeLogic:
 
     async def start(self):
         if not self.session:
-            self.session = aiohttp.ClientSession()
+            self.session = aiohttp.ClientSession(
+                headers={
+                    "User-Agent": "Mozilla/5.0 (GenshinCodeBot)"
+                }
+            )
 
     async def stop(self):
         if self.session:
             await self.session.close()
             self.session = None
 
-    async def fetch_codes(self):
-        if not self.session: await self.start()
-        
+    async def fetch_codes(self) -> Dict:
         async with self.session.get(GENSHIN_API, timeout=aiohttp.ClientTimeout(total=20)) as resp:
             if resp.status != 200:
                 return {"count": 0, "codes": []}
+
             data = await resp.json()
 
         html = data.get("parse", {}).get("text", {}).get("*")
-        if not html: return {"count": 0, "codes": []}
+        if not html:
+            return {"count": 0, "codes": []}
 
         soup = BeautifulSoup(html, "html.parser")
-        results = []
 
-        rows = soup.select("table.article-table tr")
+        results: List[Dict] = []
         
-        for row in rows:
-            cols = row.find_all("td")
-            if len(cols) < 3: continue  # Bỏ qua hàng tiêu đề hoặc hàng thiếu dữ liệu
+        for row in soup.select("table.wikitable tbody tr"):
+            tds = row.find_all("td")
+            if len(tds) < 3:
+                continue
+
+            code_el = tds[0].find("code")
+            if not code_el:
+                continue
 
-            code_tag = cols[0].find("code")
-            if not code_tag: continue
-            code_text = code_tag.get_text(strip=True)
+            code = code_el.get_text(strip=True)
 
-            server = cols[1].get_text(strip=True)
+            # server (China / Global / etc)
+            server = tds[1].get_text(" ", strip=True)
 
+            # rewards
             rewards = []
-            reward_items = cols[2].select(".item-text")
-            for item in reward_items:
-                rewards.append(item.get_text(strip=True))
-            
-            if not rewards:
-                rewards = [cols[2].get_text(strip=True).replace("\n", ", ")]
+            for item in tds[2].select(".item-text"):
+                text = item.get_text(" ", strip=True)
+                if text:
+                    rewards.append(text)
 
-            status_text = cols[3].get_text(" ", strip=True) if len(cols) > 3 else "Unknown"
+            # validity (nếu có)
+            validity = tds[3].get_text(" ", strip=True) if len(tds) >= 4 else None
 
             results.append({
-                "code": code_text,
+                "code": code,
                 "server": server,
                 "rewards": rewards,
-                "status": status_text
+                "validity": validity
             })
 
         return {
             "count": len(results),
             "codes": results
-        }
+        }