koishi-plugin-cocoyyy-console 1.2.2-alpha.1 → 1.2.2-alpha.2

package/lib/index.js

@@ -1781,6 +1781,29 @@ function extractImageAndText(content) {
   return { imageUrls, text };
 }
 __name(extractImageAndText, "extractImageAndText");
+function parseOneBotForwardNodes(nodes) {
+  const allTexts = [];
+  const allImageUrls = [];
+  for (const node of nodes) {
+    const sender = node?.sender?.nickname ?? String(node?.sender?.user_id ?? "未知");
+    const segments = node?.message ?? node?.content ?? [];
+    const msgTexts = [];
+    for (const seg of segments) {
+      if (seg?.type === "text") {
+        const t = seg.data?.text ?? "";
+        if (t) msgTexts.push(t);
+      } else if (seg?.type === "image") {
+        const url = seg.data?.url ?? seg.data?.file ?? "";
+        if (url) allImageUrls.push(url);
+      }
+    }
+    if (msgTexts.length > 0) {
+      allTexts.push(`[${sender}]: ${msgTexts.join("")}`);
+    }
+  }
+  return { imageUrls: allImageUrls, text: allTexts.join("\n") };
+}
+__name(parseOneBotForwardNodes, "parseOneBotForwardNodes");
 function extractFromForwardChildren(children) {
   const allTexts = [];
   const allImageUrls = [];
@@ -1807,33 +1830,26 @@ function extractFromForwardChildren(children) {
 }
 __name(extractFromForwardChildren, "extractFromForwardChildren");
 async function fetchForwardMessages(session, forwardId) {
+  const internal = session.bot.internal;
+  let result;
   try {
-    const result = await session.bot.internal.getForwardMsg({ id: forwardId });
-    const messages = result?.messages ?? [];
-    const allTexts = [];
-    const allImageUrls = [];
-    for (const msg of messages) {
-      const sender = msg?.sender?.nickname ?? String(msg?.sender?.user_id ?? "未知");
-      const segments = msg?.message ?? msg?.content ?? [];
-      const msgTexts = [];
-      for (const seg of segments) {
-        if (seg.type === "text") {
-          const t = seg.data?.text ?? "";
-          if (t) msgTexts.push(t);
-        } else if (seg.type === "image") {
-          const url = seg.data?.url ?? seg.data?.file ?? "";
-          if (url) allImageUrls.push(url);
-        }
-      }
-      if (msgTexts.length > 0) {
-        allTexts.push(`[${sender}]: ${msgTexts.join("")}`);
-      }
+    result = await internal.getForwardMsg({ id: forwardId });
+  } catch (e1) {
+    logger.warn("[fetchForwardMessages Warn]: getForwardMsg 调用失败，尝试 get_forward_msg: " + e1);
+    try {
+      result = await internal.get_forward_msg({ id: forwardId });
+    } catch (e2) {
+      logger.error("[fetchForwardMessages Error]: 两种 API 调用均失败: " + e2);
+      return { imageUrls: [], text: "" };
     }
-    return { imageUrls: allImageUrls, text: allTexts.join("\n") };
-  } catch (e) {
-    logger.error("[fetchForwardMessages Error]: 获取转发消息失败: " + e);
+  }
+  logger.info("[fetchForwardMessages Info]: API 返回结构预览: " + JSON.stringify(result)?.slice(0, 300));
+  const messages = result?.messages ?? [];
+  if (messages.length === 0) {
+    logger.warn("[fetchForwardMessages Warn]: API 返回 messages 为空，result keys: " + Object.keys(result ?? {}).join(", "));
     return { imageUrls: [], text: "" };
   }
+  return parseOneBotForwardNodes(messages);
 }
 __name(fetchForwardMessages, "fetchForwardMessages");
 function extractForwardId(elements, content) {
@@ -1873,6 +1889,7 @@ async function checkShitOrNot_v2(session, parttern_msg, config) {
   const quoteContent = session.quote.content;
   const quoteElements = session.quote.elements ?? [];
   logger.info("[checkShitOrNot_v2 Info]: 引用消息内容: " + quoteContent);
+  logger.info("[checkShitOrNot_v2 Info]: quoteElements 长度: " + quoteElements.length);
   let imageUrls = [];
   let text = "";
   let isForward = false;
@@ -1881,15 +1898,24 @@ async function checkShitOrNot_v2(session, parttern_msg, config) {
     isForward = true;
     logger.info("[checkShitOrNot_v2 Info]: 检测到转发聊天记录，ID: " + forwardId);
     const forwardEl = quoteElements.find((el) => el.type === "forward");
-    const forwardChildren = forwardEl?.children ?? [];
-    if (forwardChildren.length > 0) {
-      const extracted = extractFromForwardChildren(forwardChildren);
+    const attrContent = Array.isArray(forwardEl?.attrs?.content) ? forwardEl.attrs.content : [];
+    if (attrContent.length > 0) {
+      logger.info("[checkShitOrNot_v2 Info]: 从 attrs.content 提取转发内容，共 " + attrContent.length + " 条");
+      const extracted = parseOneBotForwardNodes(attrContent);
       imageUrls = extracted.imageUrls;
       text = extracted.text;
-      logger.info("[checkShitOrNot_v2 Info]: 从 children 提取转发内容，共 " + forwardChildren.length + " 条");
     }
     if (!text && imageUrls.length === 0) {
-      logger.info("[checkShitOrNot_v2 Info]: children 为空，尝试通过 NapCat API 拉取转发消息");
+      const forwardChildren = forwardEl?.children ?? [];
+      if (forwardChildren.length > 0) {
+        logger.info("[checkShitOrNot_v2 Info]: 从 children 提取转发内容，共 " + forwardChildren.length + " 条");
+        const extracted = extractFromForwardChildren(forwardChildren);
+        imageUrls = extracted.imageUrls;
+        text = extracted.text;
+      }
+    }
+    if (!text && imageUrls.length === 0) {
+      logger.info("[checkShitOrNot_v2 Info]: 本地提取失败，尝试通过 NapCat API 拉取转发消息");
       const extracted = await fetchForwardMessages(session, forwardId);
       imageUrls = extracted.imageUrls;
       text = extracted.text;
@@ -1903,7 +1929,7 @@ async function checkShitOrNot_v2(session, parttern_msg, config) {
     logger.warn("[checkShitOrNot_v2 Warn]: 引用消息中未发现文本或图片");
     return isForward ? "转发聊天记录中未发现可分析的文本或图片" : "引用消息中未发现文本或图片";
   }
-  logger.info("[checkShitOrNot_v2 Info]: 提取图片 URL: " + imageUrls.join(", "));
+  logger.info("[checkShitOrNot_v2 Info]: 提取文本长度: " + text.length + "，图片数: " + imageUrls.length);
   const displayText = isForward ? `以下是转发聊天记录的内容:
 
 ${text}` : text;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-cocoyyy-console",
   "description": "自用koishi插件，功能包含复读，记录黑历史，*人等",
-  "version": "1.2.2-alpha.1",
+  "version": "1.2.2-alpha.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "contributors": [