Update fetch_cwa_alarm_list.py

fetch_cwa_alarm_list.py

@@ -6,12 +6,7 @@ from datetime import datetime, timedelta, timezone
 CWA_ALARM_API = "https://app-2.cwa.gov.tw/api/v1/earthquake/alarm/list"
 
 def _parse_cwa_time(s: str) -> tuple[str, str]:
-    """
-    解析 CWA 的 originTime。
-    - 若帶有時區或 'Z'，尊重其時區；輸出台灣時間與 UTC。
-    - 若無時區（常見 'YYYY-MM-DD HH:MM:SS'），視為台灣時間 (UTC+8)。
-    回傳: (tw_str, utc_str) -> "YYYY-MM-DD HH:MM"
-    """
+    """回傳 (台灣時間, UTC)；若字串無時區，預設視為台灣時間。"""
     if not s:
         return ("未知", "未知")
     try:
@@ -27,10 +22,7 @@ def _parse_cwa_time(s: str) -> tuple[str, str]:
         return (s, "未知")
 
 def fetch_cwa_alarm_list(limit: int = 5) -> str:
-    """
-    取得中央氣象署「地震預警」清單並格式化為文字（抓常見欄位；最多 limit 筆）。
-    顯示：事件ID、狀態/訊息型別#序號、震級、深度、震中座標、台灣時間與UTC、預警地區。
-    """
+    """抓 CWA 地震預警並格式化輸出。"""
     try:
         r = requests.get(CWA_ALARM_API, timeout=10)
         r.raise_for_status()
@@ -38,7 +30,6 @@ def fetch_cwa_alarm_list(limit: int = 5) -> str:
     except Exception as e:
         return f"❌ 地震預警查詢失敗：{e}"
 
-    # 取出清單
     items = None
     if isinstance(payload, dict):
         items = payload.get("data") or payload.get("records") or payload.get("list") or payload.get("items")
@@ -47,7 +38,7 @@ def fetch_cwa_alarm_list(limit: int = 5) -> str:
     if not items:
         return "✅ 目前沒有地震預警。"
 
-    # 依 originTime 由新到舊排序
+    # 由新到舊
     def _key(it):
         s = it.get("originTime") or ""
         try:
@@ -64,22 +55,18 @@ def fetch_cwa_alarm_list(limit: int = 5) -> str:
     except Exception:
         pass
 
-    lines = ["🚨 地震預警（最新）:", "-" * 20]
-    count = 0
-    for it in items:
-        if count >= limit:
-            break
+    def _num(x):
+        xs = str(x)
+        ok = xs.replace(".", "", 1).replace("-", "", 1).isdigit()
+        return float(xs) if ok else None
 
+    lines = ["🚨 地震預警（最新）:", "-" * 20]
+    for idx, it in enumerate(items[:limit]):
         identifier = it.get("identifier") or it.get("eventId") or it.get("id") or "—"
         status = it.get("status") or "—"
         msg_type = it.get("msgType") or "—"
         msg_no = it.get("msgNo") or it.get("msgSeq") or "—"
 
-        def _num(x):
-            xs = str(x)
-            ok = xs.replace(".", "", 1).replace("-", "", 1).isdigit()
-            return float(xs) if ok else None
-
         mag = _num(it.get("magnitudeValue") or it.get("magnitude") or it.get("ml") or it.get("mw"))
         mag_str = f"{mag:.1f}" if mag is not None else "—"
 
@@ -110,7 +97,6 @@ def fetch_cwa_alarm_list(limit: int = 5) -> str:
             f"預警地區: {areas_txt}"
         )
         lines.append("")
-        count += 1
 
     if len(items) > limit:
         lines.append(f"... 另有 {len(items) - limit} 筆。")