refactor: 修复处理kook消息失败时打印消息类型是数字而不是类型名称的bug,_parse_card_message验证数据模型失败后改为直接raise

Author: shuiping233

astrbot/core/platform/sources/kook/kook_adapter.py

@@ -273,9 +273,8 @@ def _parse_card_message(self, data: KookMessageEvent) -> tuple[list, str]:
         try:
             card_list = KookCardMessageContainer.from_dict(json.loads(content))
 
-        except pydantic.ValidationError as e:
-            logger.error(f"[KOOK] 解析卡片消息错误: {e}")
-            logger.error(f"[KOOK] 原始消息内容: {data.to_json()}")
+        except pydantic.ValidationError:
+            raise
 
         text_parts: list[str] = []
         images: list[str] = []
@@ -370,10 +369,11 @@ async def convert_message(self, data: KookMessageEvent) -> AstrBotMessage:
                 abm.message, abm.message_str = self._parse_card_message(data)
             except Exception as exp:
                 logger.error(f"[KOOK] 卡片消息解析失败: {exp}")
+                logger.error(f"[KOOK] 原始消息内容: {data.to_json()}")
                 abm.message_str = "[卡片消息解析失败]"
                 abm.message = [Plain(text="[卡片消息解析失败]")]
         else:
-            logger.warning(f'[KOOK] 不支持的kook消息类型: "{data.type}"')
+            logger.warning(f'[KOOK] 不支持的kook消息类型: "{data.type.name}"')
             abm.message_str = "[不支持的消息类型]"
             abm.message = [Plain(text="[不支持的消息类型]")]
 

astrbot/core/platform/sources/kook/kook_event.py

@@ -183,7 +183,7 @@ async def send(self, message: MessageChain):
             if item.reply_id:
                 reply_id = item.reply_id
             if not item.text:
-                logger.debug(f'[Kook] 跳过空消息,类型为"{item.type}"')
+                logger.debug(f'[Kook] 跳过空消息,类型为"{item.type.name}"')
                 continue
             try:
                 await self.client.send_text(