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

package/lib/index.js

@@ -1781,77 +1781,64 @@ 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") {
+function parseSegments(segments, depth) {
+  const texts = [];
+  const imageUrls = [];
+  for (const seg of segments) {
+    switch (seg?.type) {
+      case "text": {
         const t = seg.data?.text ?? "";
-        if (t) msgTexts.push(t);
-      } else if (seg?.type === "image") {
+        if (t) texts.push(t);
+        break;
+      }
+      case "image": {
         const url = seg.data?.url ?? seg.data?.file ?? "";
-        if (url) allImageUrls.push(url);
+        if (url) imageUrls.push(url);
+        break;
       }
-    }
-    if (msgTexts.length > 0) {
-      allTexts.push(`[${sender}]: ${msgTexts.join("")}`);
+      case "forward": {
+        if (depth >= 1) {
+          texts.push("[嵌套转发消息]");
+        } else {
+          const nestedNodes = seg.data?.content ?? [];
+          if (nestedNodes.length > 0) {
+            const nested = parseOneBotForwardNodes(nestedNodes, depth + 1);
+            if (nested.text) texts.push(`[嵌套转发记录]
+${nested.text}
+[嵌套转发记录结束]`);
+            imageUrls.push(...nested.imageUrls);
+          } else {
+            texts.push("[嵌套转发消息]");
+          }
+        }
+        break;
+      }
+      case "json":
+      case "xml":
+        texts.push("[卡片消息]");
+        break;
+      default:
+        break;
     }
   }
-  return { imageUrls: allImageUrls, text: allTexts.join("\n") };
+  return { texts, imageUrls };
 }
-__name(parseOneBotForwardNodes, "parseOneBotForwardNodes");
-function extractFromForwardChildren(children) {
+__name(parseSegments, "parseSegments");
+function parseOneBotForwardNodes(nodes, depth = 0) {
   const allTexts = [];
   const allImageUrls = [];
-  for (const msgEl of children) {
-    if (msgEl.type !== "message") continue;
-    const msgChildren = msgEl.children ?? [];
-    const authorEl = msgChildren.find((c) => c.type === "author");
-    const senderName = authorEl?.attrs?.name ?? String(authorEl?.attrs?.id ?? "未知");
-    const msgTexts = [];
-    for (const child of msgChildren) {
-      if (child.type === "text") {
-        const t = child.attrs?.content ?? "";
-        if (t) msgTexts.push(t);
-      } else if (child.type === "img" || child.type === "image") {
-        const url = child.attrs?.src ?? child.attrs?.url ?? "";
-        if (url) allImageUrls.push(url);
-      }
-    }
-    if (msgTexts.length > 0) {
-      allTexts.push(`[${senderName}]: ${msgTexts.join("")}`);
+  for (const node of nodes) {
+    const sender = node?.sender?.nickname ?? String(node?.sender?.user_id ?? "未知");
+    const segments = node?.message ?? node?.content ?? [];
+    const { texts, imageUrls } = parseSegments(segments, depth);
+    allImageUrls.push(...imageUrls);
+    if (texts.length > 0) {
+      allTexts.push(`[${sender}]: ${texts.join("")}`);
     }
   }
   return { imageUrls: allImageUrls, text: allTexts.join("\n") };
 }
-__name(extractFromForwardChildren, "extractFromForwardChildren");
-async function fetchForwardMessages(session, forwardId) {
-  const internal = session.bot.internal;
-  let result;
-  try {
-    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: "" };
-    }
-  }
-  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");
+__name(parseOneBotForwardNodes, "parseOneBotForwardNodes");
 function extractForwardId(elements, content) {
   const forwardEl = elements.find((el) => el.type === "forward");
   if (forwardEl?.attrs?.id) return String(forwardEl.attrs.id);
@@ -1905,21 +1892,6 @@ async function checkShitOrNot_v2(session, parttern_msg, config) {
       imageUrls = extracted.imageUrls;
       text = extracted.text;
     }
-    if (!text && imageUrls.length === 0) {
-      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;
-    }
   } else {
     const extracted = extractImageAndText(quoteContent);
     imageUrls = extracted.imageUrls;

package/package.json

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