Update cwa_service.py

cwa_service.py

@@ -14,16 +14,36 @@ def _to_float(x):
     return float(m.group()) if m else None
 
 def _parse_cwa_time(s: str) -> tuple[str, str]:
+    """
+    [修正]
+    使其能夠處理兩種 CWA API 可能的時間格式:
+    1. ISO 8601 格式 (e.g., '2025-08-19T03:55:47Z')
+    2. 本地時間格式 (e.g., '2025-08-19 09:26:11')
+    """
     if not s: return ("未知", "未知")
+    
+    dt_utc = None
+    # 嘗試解析 ISO 8601 格式
     try:
-        dt = datetime.fromisoformat(s.replace("Z", "+00:00"))
-        tw = dt.astimezone(TAIPEI_TZ).strftime("%Y-%m-%d %H:%M")
-        utc = dt.astimezone(timezone.utc).strftime("%Y-%m-%d %H:%M")
-        return (tw, utc)
-    except Exception:
-        return (s, "未知")
+        dt_utc = datetime.fromisoformat(s.replace("Z", "+00:00"))
+    except ValueError:
+        # 若失敗，嘗試解析 YYYY-MM-DD HH:MM:SS 格式，並假設其為台北時間
+        try:
+            dt_local = datetime.strptime(s, "%Y-%m-%d %H:%M:%S")
+            dt_local = dt_local.replace(tzinfo=TAIPEI_TZ)
+            dt_utc = dt_local.astimezone(timezone.utc)
+        except Exception:
+            return (s, "未知") # 若兩種格式都失敗，回傳原始字串
+
+    if dt_utc:
+        tw_str = dt_utc.astimezone(TAIPEI_TZ).strftime("%Y-%m-%d %H:%M")
+        utc_str = dt_utc.astimezone(timezone.utc).strftime("%Y-%m-%d %H:%M")
+        return (tw_str, utc_str)
+    
+    return (s, "未知")
 
 def fetch_cwa_alarm_list(limit: int = 5) -> str:
+    """抓 CWA 地震預警並格式化輸出。"""
     try:
         r = requests.get(CWA_ALARM_API, timeout=10)
         r.raise_for_status()
@@ -48,8 +68,12 @@ def fetch_cwa_alarm_list(limit: int = 5) -> str:
         msg_type = str(it.get('msgType', '—')).replace('{', '{{').replace('}', '}}')
         msg_no = str(it.get('msgNo', '—')).replace('{', '{{').replace('}', '}}')
         
-        alert_areas_list = it.get('alertAreas')
-        areas_str = ", ".join(str(area) for area in alert_areas_list) if isinstance(alert_areas_list, list) and alert_areas_list else "—"
+        # [修正] 將讀取欄位從 alertAreas 改為 locationDesc
+        location_desc_list = it.get('locationDesc')
+        if isinstance(location_desc_list, list) and location_desc_list:
+            areas_str = ", ".join(str(area) for area in location_desc_list)
+        else:
+            areas_str = "—"
         areas = areas_str.replace('{', '{{').replace('}', '}}')
         
         mag_str = f"{mag:.1f}" if mag is not None else "—"
@@ -58,7 +82,7 @@ def fetch_cwa_alarm_list(limit: int = 5) -> str:
             f"事件: {identifier} | 類型: {msg_type}#{msg_no}\n"
             f"規模/深度: M{mag_str} / {depth_str} km\n"
             f"時間: {tw_str}（台灣）\n"
-            f"預警地區: {areas}"
+            f"地點: {areas}" # 標籤改為「地點」更符合 locationDesc 的語意
         )
     return "\n\n".join(lines).strip()