koishi-plugin-best-cave 2.4.5 → 2.4.7

package/lib/index.js

@@ -297,10 +297,22 @@ async function buildCaveMessage(cave, config, fileManager, logger2, platform, pr
           const forwardNodes = Array.isArray(el.content) ? el.content : [];
           const messageNodes = await Promise.all(forwardNodes.map(async (node) => {
             const author = (0, import_koishi.h)("author", { id: node.userId, name: node.userName });
-            const content = await transformToH(node.elements);
-            return (0, import_koishi.h)("message", {}, [author, ...content]);
+            const contentElements = await transformToH(node.elements);
+            const unwrappedContent = [];
+            const nestedMessageNodes = [];
+            for (const contentEl of contentElements) {
+              if (contentEl.type === "message" && contentEl.attrs.forward) {
+                nestedMessageNodes.push(...contentEl.children);
+              } else {
+                unwrappedContent.push(contentEl);
+              }
+            }
+            const resultNodes = [];
+            if (unwrappedContent.length > 0) resultNodes.push((0, import_koishi.h)("message", {}, [author, ...unwrappedContent]));
+            resultNodes.push(...nestedMessageNodes);
+            return resultNodes;
           }));
-          return (0, import_koishi.h)("message", { forward: true }, messageNodes);
+          return (0, import_koishi.h)("message", { forward: true }, messageNodes.flat());
         } catch (error) {
           logger2.warn(`解析回声洞（${cave.id}）合并转发内容失败:`, error);
           return import_koishi.h.text("[合并转发]");
@@ -321,7 +333,7 @@ async function buildCaveMessage(cave, config, fileManager, logger2, platform, pr
         }
       }
       return null;
-    })).then((hElements) => hElements.filter(Boolean));
+    })).then((hElements) => hElements.flat().filter(Boolean));
   }
   __name(transformToH, "transformToH");
   const caveHElements = await transformToH(cave.elements);
@@ -344,7 +356,8 @@ async function buildCaveMessage(cave, config, fileManager, logger2, platform, pr
   const followUpMessages = [];
   for (const el of caveHElements) {
     if (problematicTypes.includes(el.type) || el.type === "message" && el.attrs.forward) {
-      initialMessageContent.push(import_koishi.h.text(placeholderMap["forward"]));
+      const placeholderKey = el.type === "message" && el.attrs.forward ? "forward" : el.type;
+      initialMessageContent.push(import_koishi.h.text(placeholderMap[placeholderKey]));
       followUpMessages.push([el]);
     } else {
       initialMessageContent.push(el);
@@ -402,10 +415,46 @@ __name(getNextCaveId, "getNextCaveId");
 async function processMessageElements(sourceElements, newId, session, config, logger2) {
   const mediaToSave = [];
   let mediaIndex = 0;
+  const typeMap = { "img": "image", "image": "image", "video": "video", "audio": "audio", "file": "file", "text": "text", "at": "at", "forward": "forward", "reply": "reply" };
+  const defaultExtMap = { "image": ".jpg", "video": ".mp4", "audio": ".mp3", "file": ".dat" };
   async function transform(elements) {
     const result = [];
-    const typeMap = { "img": "image", "image": "image", "video": "video", "audio": "audio", "file": "file", "text": "text", "at": "at", "forward": "forward", "reply": "reply" };
-    const defaultExtMap = { "image": ".jpg", "video": ".mp4", "audio": ".mp3", "file": ".dat" };
+    async function processForwardContent(segments) {
+      const innerResult = [];
+      for (const segment of segments) {
+        const sType = typeMap[segment.type];
+        if (!sType) continue;
+        if (sType === "text" && segment.data?.text?.trim()) {
+          innerResult.push({ type: "text", content: segment.data.text.trim() });
+        } else if (sType === "at" && (segment.data?.id || segment.data?.qq)) {
+          innerResult.push({ type: "at", content: segment.data.id || segment.data.qq });
+        } else if (sType === "reply" && segment.data?.id) {
+          innerResult.push({ type: "reply", content: segment.data.id });
+        } else if (["image", "video", "audio", "file"].includes(sType) && (segment.data?.src || segment.data?.url)) {
+          let fileIdentifier = segment.data.src || segment.data.url;
+          if (fileIdentifier.startsWith("http")) {
+            const ext = path2.extname(segment.data.file || "") || defaultExtMap[sType];
+            const currentMediaIndex = ++mediaIndex;
+            const fileName = `${newId}_${currentMediaIndex}_${session.channelId || session.guildId}_${session.userId}${ext}`;
+            mediaToSave.push({ sourceUrl: fileIdentifier, fileName });
+            fileIdentifier = fileName;
+          }
+          innerResult.push({ type: sType, file: fileIdentifier });
+        } else if (sType === "forward" && Array.isArray(segment.data?.content)) {
+          const nestedForwardNodes = [];
+          for (const nestedNode of segment.data.content) {
+            if (!nestedNode.message || !Array.isArray(nestedNode.message)) continue;
+            const nestedContentElements = await processForwardContent(nestedNode.message);
+            if (nestedContentElements.length > 0) {
+              nestedForwardNodes.push({ userId: nestedNode.sender?.user_id, userName: nestedNode.sender?.nickname, elements: nestedContentElements });
+            }
+          }
+          if (nestedForwardNodes.length > 0) innerResult.push({ type: "forward", content: nestedForwardNodes });
+        }
+      }
+      return innerResult;
+    }
+    __name(processForwardContent, "processForwardContent");
     for (const el of elements) {
       const type = typeMap[el.type];
       if (!type) {
@@ -422,27 +471,10 @@ async function processMessageElements(sourceElements, newId, session, config, lo
         const forwardNodes = [];
         for (const node of el.attrs.content) {
           if (!node.message || !Array.isArray(node.message)) continue;
-          const userId = node.sender?.user_id;
-          const userName = node.sender?.nickname;
-          const elementsToProcess = node.message.map((segment) => {
-            const { type: type2, data } = segment;
-            const attrs = { ...data };
-            if (type2 === "text" && typeof data.text !== "undefined") {
-              attrs.content = data.text;
-              delete attrs.text;
-            }
-            if (type2 === "at" && typeof data.qq !== "undefined") {
-              attrs.id = data.qq;
-              delete attrs.qq;
-            }
-            if (["image", "video", "audio"].includes(type2) && typeof data.url !== "undefined") {
-              attrs.src = data.url;
-              delete attrs.url;
-            }
-            return (0, import_koishi.h)(type2, attrs);
-          });
-          const contentElements = await transform(elementsToProcess);
-          if (contentElements.length > 0) forwardNodes.push({ userId, userName, elements: contentElements });
+          const contentElements = await processForwardContent(node.message);
+          if (contentElements.length > 0) {
+            forwardNodes.push({ userId: node.sender?.user_id, userName: node.sender?.nickname, elements: contentElements });
+          }
         }
         if (forwardNodes.length > 0) result.push({ type: "forward", content: forwardNodes });
       } else if (["image", "video", "audio", "file"].includes(type) && el.attrs.src) {
@@ -1088,7 +1120,7 @@ function apply(ctx, config) {
         if (hashManager && textHashesToStore.length > 0) await ctx.database.upsert("cave_hash", textHashesToStore.map((h4) => ({ ...h4, cave: newCave.id })));
         if (initialStatus === "pending") reviewManager.sendForPend(newCave);
       }
-      return initialStatus === "pending" || initialStatus === "preload" && config.enablePend ? `提交成功，序号为（${newCave.id}）` : `添加成功，序号为（${newCave.id}）`;
+      return needsReview ? `提交成功，序号为（${newCave.id}）` : `添加成功，序号为（${newCave.id}）`;
     } catch (error) {
       logger.error("添加回声洞失败:", error);
       return "添加失败，请稍后再试";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-best-cave",
   "description": "功能强大、高度可定制的回声洞。支持丰富的媒体类型、内容查重、人工审核、用户昵称、数据迁移以及本地/S3 双重文件存储后端。",
-  "version": "2.4.5",
+  "version": "2.4.7",
   "contributors": [
     "Yis_Rime <yis_rime@outlook.com>"
   ],