Update app/gscode_logic.py

app/gscode_logic.py

@@ -24,31 +24,49 @@ class GenshinCodeLogic:
             self.session = None
 
     async def fetch_codes(self):
-        async with self.session.get(
-            GENSHIN_API,
-            headers={
-                "User-Agent": "Mozilla/5.0"
-            },
-            timeout=aiohttp.ClientTimeout(total=20)
-        ) as resp:
+        if not self.session: await self.start()
+        
+        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 = []
 
-        codes = {
-            c.text.strip()
-            for c in soup.select("code")
-            if c.text and len(c.text.strip()) >= 6
-        }
+        rows = soup.select("table.article-table tr")
+        
+        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
+
+            code_tag = cols[0].find("code")
+            if not code_tag: continue
+            code_text = code_tag.get_text(strip=True)
+
+            server = cols[1].get_text(strip=True)
+
+            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", ", ")]
+
+            status_text = cols[3].get_text(" ", strip=True) if len(cols) > 3 else "Unknown"
+
+            results.append({
+                "code": code_text,
+                "server": server,
+                "rewards": rewards,
+                "status": status_text
+            })
 
         return {
-            "count": len(codes),
-            "codes": sorted(codes)
-        }
+            "count": len(results),
+            "codes": results
+        }