修复 Heartbeat 不符合 OneBot V11 标准的问题

basic_api_v11.py

@@ -2,7 +2,6 @@
 from api import register_action
 from discord.abc import PrivateChannel
 from discord.channel import CategoryChannel, ForumChannel
-from discord.types.channel import ThreadChannel
 from logger import get_logger
 import translator
 import message_parser_v11
@@ -12,7 +11,6 @@
 import message_parser_v11
 import version
 
-
 logger = get_logger()
 
 @register_action("v11")
@@ -123,7 +121,7 @@ async def get_msg(message_id: int) -> dict:
 async def set_group_kick(group_id: int, user_id: int, reason: str | None = None, reject_add_request: bool = False) -> dict:
     if not (group := client.get_channel(group_id)):
         return return_object.get(1400, f"不存在的频道：{group_id}")
-    if isinstance(group, PrivateChannel | ForumChannel | ThreadChannel | CategoryChannel):
+    if isinstance(group, PrivateChannel | ForumChannel | CategoryChannel):
         return return_object.get(1400, f"不支持的操作：从 {type(group)} 中移除 {user_id}")
     for user in group.members:
         if user.id == user_id:
@@ -137,7 +135,7 @@ async def set_group_kick(group_id: int, user_id: int, reason: str | None = None,
 async def set_group_ban(group_id: int, user_id: int, duration: int = 1800, reason: str | None = None) -> dict:
     if not (group := client.get_channel(group_id)):
         return return_object.get(1400, f"不存在的频道：{group_id}")
-    if isinstance(group, PrivateChannel | ForumChannel | ThreadChannel | CategoryChannel):
+    if isinstance(group, PrivateChannel | ForumChannel | CategoryChannel):
         return return_object.get(1400, f"不支持的操作：从 {type(group)} 中禁言 {user_id}")
     for user in group.members:
         if user.id == user_id:

http_post_v11.py

@@ -48,7 +48,7 @@ async def push_event(self, _event: dict) -> None:
         Args:
             event (dict): 事件
         """
-        event = translator.translate_event(_event)
+        event = await translator.translate_event(_event)
         async with httpx.AsyncClient(timeout=self.config["timeout"]) as client:
             response = await client.post(
                 self.config["url"],

translator.py

@@ -1,12 +1,13 @@
 from config import config
 import message_parser_v11
 from client import client
+import basic_api_v11
 from logger import get_logger
 
 logger = get_logger()
 
 
-def translate_event(_event: dict) -> dict:
+async def translate_event(_event: dict) -> dict:
     event = _event.copy()
     # 键名替换
     event["time"] = int(event["time"]) 
@@ -49,6 +50,8 @@ def translate_event(_event: dict) -> dict:
                 "card": sender.display_name
             })
         event["message"] = message_parser_v11.parse_text(event["raw_message"])
+    elif event["post_type"] == "meta_event" and event["meta_event_type"] == "heartbeat":
+        event["status"] = (await basic_api_v11.get_status())["data"]
     logger.debug(event)
     return event
 

ws_reverse_v11.py

@@ -10,7 +10,7 @@
 import websockets.client
 import websockets.exceptions
 from logger import get_logger
-from version import VERSION
+# from version import VERSION
 
 BASE_CONFIG = {
     "url": None,
@@ -49,7 +49,7 @@ async def connect(self) -> None:
         except Exception:
             pass
         await self.event_ws.send(json.dumps(
-            translator.translate_event(event.get_event_object(
+            await translator.translate_event(event.get_event_object(
                 "meta",
                 "lifecycle",
                 "connect"
@@ -88,7 +88,7 @@ async def push_event(self, event: dict) -> None:
         try:
             await self.event_ws.send(
                 json.dumps(
-                    translator.translate_event(
+                    await translator.translate_event(
                         event
                     )
                 )
@@ -122,4 +122,4 @@ def get_headers(self, role: str) -> dict:
         return {
             "X-Self-ID": client.user.id,
             "X-Client-Role": role
-        } | ({"Authorization": f'Bearer {self.config["access_token"]}'} if self.config["access_token"] else {})
+        } | ({"Authorization": f'Bearer {self.config["access_token"]}'} if self.config["access_token"] else {})

ws_v11.py

@@ -40,7 +40,7 @@ async def handle_event_route(self, websocket: fastapi.WebSocket) -> None:
             return
         await websocket.accept()
         self.clients_on_event_route.append(websocket)
-        await websocket.send_json(translator.translate_event(event.get_event_object(
+        await websocket.send_json(await translator.translate_event(event.get_event_object(
             "meta",
             "lifecycle",
             "connect"
@@ -86,7 +86,7 @@ async def handle_root_route(self, websocket: fastapi.WebSocket) -> None:
             await websocket.send_json(resp_data)
 
     async def push_event(self, _event: dict) -> None:
-        event = translator.translate_event(_event)
+        event = await translator.translate_event(_event)
         for client in self.clients_on_event_route:
             try:
                 await client.send_json(event)