refactor: 即使消息链中有消息发送失败了,也尽可能将其他消息发送出去,并把报错信息也发送出去

Author: shuiping233

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

@@ -332,16 +332,18 @@ async def send_text(
             async with self._http_client.post(url, json=payload) as resp:
                 if resp.status == 200:
                     result = await resp.json()
-                    if result.get("code") == 0:
-                        logger.info("[KOOK] 发送消息成功")
-                    else:
-                        logger.error(
-                            f'[KOOK] 发送kook消息类型 "{kook_message_type.name}" 失败: {result}'
+                    if result.get("code") != 0:
+                        raise RuntimeError(
+                            f'发送kook消息类型 "{kook_message_type.name}" 失败: {result}'
                         )
+                    # else:
+                    #     logger.info("[KOOK] 发送消息成功")
                 else:
-                    logger.error(
-                        f'[KOOK] 发送kook消息类型 "{kook_message_type.name}" HTTP错误: {resp.status} , 响应内容 : {await resp.text()}'
+                    raise RuntimeError(
+                        f'发送kook消息类型 "{kook_message_type.name}" HTTP错误: {resp.status} , 响应内容 : {await resp.text()}'
                     )
+        except RuntimeError:
+            raise
         except Exception as e:
             logger.error(
                 f'[KOOK] 发送kook消息类型 "{kook_message_type.name}" 异常: {e}'

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

@@ -164,18 +164,35 @@ async def send(self, message: MessageChain):
         # order_messages.sort(key=lambda x: 0 if x.reply_id else 1)
 
         reply_id: str | int = ""
+        # TODO 暂时用不了 ExceptionGroup,
+        # 因为pyproject的target-version是"py3.10"
+        errors: list[Exception] = []
         for item in order_messages:
             if item.reply_id:
                 reply_id = item.reply_id
             if not item.text:
                 logger.debug(f'[Kook] 跳过空消息,类型为"{item.type}"')
                 continue
-            await self.client.send_text(
-                self.channel_id,
-                item.text,
-                self.astrbot_message_type,
-                item.type,
-                reply_id,
-            )
+            try:
+                await self.client.send_text(
+                    self.channel_id,
+                    item.text,
+                    self.astrbot_message_type,
+                    item.type,
+                    reply_id,
+                )
+            except RuntimeError as exp:
+                await self.client.send_text(
+                    self.channel_id,
+                    str(exp),
+                    self.astrbot_message_type,
+                    KookMessageType.TEXT,
+                    reply_id,
+                )
+                errors.append(exp)
+
+        if errors:
+            err_msg = "\n".join([str(err) for err in errors])
+            logger.error(f"[kook] {err_msg}")
 
         await super().send(message)