nonebot-plugin-maimaimonitor 26.2.2__tar.gz → 26.2.4__tar.gz

{nonebot_plugin_maimaimonitor-26.2.2 → nonebot_plugin_maimaimonitor-26.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-maimaimonitor
-Version: 26.2.2
+Version: 26.2.4
 Summary: A NoneBot2 plugin to report maimai server status.
 Author: Chongxi3555
 License-Expression: MIT

{nonebot_plugin_maimaimonitor-26.2.2 → nonebot_plugin_maimaimonitor-26.2.4}/README.md

@@ -48,7 +48,7 @@ pip install nonebot-plugin-maimaimonitor
 | `MAIMAI_BROADCAST_INTERVAL` | `int` | `300` | 广播轮询检测间隔（秒）|
 | `MAIMAI_BROADCAST_ALL_GROUPS` | `bool` | `false` | 向bot所在所有群播报，谨慎使用 |
 | `MAIMAI_BROADCAST_TIME_RANGES` | `str` | 无 | 推送时间白名单，格式如 `8-11,13-20`，空时不限制。左闭右开（`8-11` 包含 8 点不包含 11 点），跨天用 `22-6`（晚上 10 点到早上 6 点）|
-| `MAIMAI_BROADCAST_SERVERS` | `list[str]` | `[]` | 要播报的服务器列表，可填 key 或名字（如 `["net","aime"]`）。留空默认除配信外全部（NET/会员/标题/公众号）都播报宕机提示 |
+| `MAIMAI_BROADCAST_SERVERS` | `list[str]` | `[]` | 要播报的服务器列表，可填 key 或名字（如 `["net","aime"]`）。留空默认全部服务（NET/会员/标题/公众号）都播报宕机提示 |
 
 > **申请 Client ID**：Client ID 由您自行提供，任意 ASCII 字符串，联系 qwq@chongxi.us 或 chongxi3555@proton.me 获取对应私钥。
 
@@ -66,7 +66,6 @@ pip install nonebot-plugin-maimaimonitor
 🟢 会员      38ms
 🟢 标题      45ms
 🟢 公众号    51ms
-🟢 配信      40ms
 
 ⏱ 当前延迟：42ms｜服务器负载：流畅｜延迟稳定
 💬 服务器运行正常
@@ -101,7 +100,7 @@ pip install nonebot-plugin-maimaimonitor
 - 返航（正常）：「华立冯返航了」「SEGA老冯落地」
 
 ### 断网播报 (无需私钥)
-配置 `MAIMAI_BROADCAST_GROUP_IDS` 或开启 `MAIMAI_BROADCAST_ALL_GROUPS` 后，服务器宕机时自动推送（默认除配信外所有服务的宕机都会播报，可用 `MAIMAI_BROADCAST_SERVERS` 限定播报范围）：
+配置 `MAIMAI_BROADCAST_GROUP_IDS` 或开启 `MAIMAI_BROADCAST_ALL_GROUPS` 后，服务器宕机时自动推送（默认全部服务的宕机都会播报，可用 `MAIMAI_BROADCAST_SERVERS` 限定播报范围）：
 
 ```
 【舞萌DX服务器断网播报】

{nonebot_plugin_maimaimonitor-26.2.2 → nonebot_plugin_maimaimonitor-26.2.4}/nonebot_plugin_maimaimonitor/maimai_plugin_v11.py

@@ -59,23 +59,17 @@ def _resolve_verdict(data: dict) -> str:
     return LEGACY_STATUS_TO_VERDICT.get(data.get("status", "normal"), "normal")
 
 
-def _is_delivery(s: dict) -> bool:
-    key = str(s.get("key", "")).lower()
-    name = str(s.get("name", "")).lower()
-    return key == "haisin" or (not key and name == "配信")
-
-
 def _broadcast_eligible(services) -> list[dict]:
     cfg = {str(x).lower() for x in config.maimai_broadcast_servers}
-    if cfg:
-        out = []
-        for s in services or []:
-            candidates = {str(s.get("key", "")).lower(), str(s.get("name", "")).lower()}
-            candidates.discard("")
-            if candidates & cfg:
-                out.append(s)
-        return out
-    return [s for s in services or [] if not _is_delivery(s)]
+    if not cfg:
+        return list(services or [])
+    out = []
+    for s in services or []:
+        candidates = {str(s.get("key", "")).lower(), str(s.get("name", "")).lower()}
+        candidates.discard("")
+        if candidates & cfg:
+            out.append(s)
+    return out
 
 
 def _render_services(services) -> list[str]:
@@ -119,7 +113,7 @@ async def handle_net(matcher: Matcher):
     data = await reporter.fetch_status()
     if not data:
         await matcher.finish(
-            "获取服务器状态失败，请稍后重试\n🔗 https://mai.chongxi.us"
+            "获取服务器状态失败，请稍后重试\n📡 数据来源：华立服务器死了吗 by Chongxi"
         )
         return
 
@@ -158,7 +152,7 @@ async def handle_net(matcher: Matcher):
     if broadcast and broadcast.get("msg"):
         msg += f"\n📢 {broadcast['msg']}\n"
 
-    msg += "\n🔗 详情请查看 https://mai.chongxi.us/"
+    msg += "\n📡 数据来源：华立服务器死了吗 by Chongxi"
 
     await matcher.finish(msg)
 
@@ -267,7 +261,7 @@ async def check_server_status():
             msg = "【舞萌DX服务器状态恢复】\n"
             msg += f"{VERDICT_MAP.get(cur, '❓ 未知')}\n"
             msg += f"本次约持续 {format_duration(duration)}\n\n"
-            msg += "🔗 详情请查看 https://mai.chongxi.us/"
+            msg += "\n📡 数据来源：华立服务器死了吗 by Chongxi"
             logger.info(f"服务器恢复正常，播报恢复通知")
             await broadcast_to_groups(msg)
             return
@@ -288,7 +282,7 @@ async def check_server_status():
         msg += f"\n💬 {summary}\n"
         for log in logs[:3]:
             msg += f"• {log.get('time_ago', '--')} {log.get('region', '--')} {log.get('type', '--')}\n"
-        msg += "\n🔗 详情请查看 https://mai.chongxi.us/"
+        msg += "\n📡 数据来源：华立服务器死了吗 by Chongxi"
         logger.info(f"检测到服务器宕机，开始播报")
         await broadcast_to_groups(msg)
 

{nonebot_plugin_maimaimonitor-26.2.2 → nonebot_plugin_maimaimonitor-26.2.4}/nonebot_plugin_maimaimonitor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-maimaimonitor
-Version: 26.2.2
+Version: 26.2.4
 Summary: A NoneBot2 plugin to report maimai server status.
 Author: Chongxi3555
 License-Expression: MIT

{nonebot_plugin_maimaimonitor-26.2.2 → nonebot_plugin_maimaimonitor-26.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-maimaimonitor"
-version = "26.2.2"
+version = "26.2.4"
 description = "A NoneBot2 plugin to report maimai server status."
 license = "MIT"
 requires-python = ">=3.8"