koishi-plugin-best-cave 2.3.11 → 2.3.13

package/lib/index.d.ts

@@ -7,7 +7,7 @@ export declare const usage = "\n<div style=\"border-radius: 10px; border: 1px so
  * @description 存储在数据库中的单个消息元素。
  */
 export interface StoredElement {
-    type: 'text' | 'image' | 'video' | 'audio' | 'file' | 'at' | 'forward';
+    type: 'text' | 'image' | 'video' | 'audio' | 'file' | 'at' | 'forward' | 'reply';
     content?: string;
     file?: string;
 }

package/lib/index.js

@@ -297,10 +297,16 @@ async function buildCaveMessage(cave, config, fileManager, logger2) {
     return Promise.all(elements.map(async (el) => {
       if (el.type === "text") return import_koishi.h.text(el.content);
       if (el.type === "at") return (0, import_koishi.h)("at", { id: el.content });
+      if (el.type === "reply") return (0, import_koishi.h)("reply", { id: el.content });
       if (el.type === "forward") {
         try {
-          const children = JSON.parse(el.content || "[]");
-          return (0, import_koishi.h)("forward", {}, await transformToH(children));
+          const forwardNodes = JSON.parse(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]);
+          }));
+          return (0, import_koishi.h)("forward", {}, messageNodes);
         } catch (error) {
           logger2.warn(`解析回声洞（${cave.id}）合并转发内容失败:`, error);
           return import_koishi.h.text("[合并转发]");
@@ -409,7 +415,7 @@ async function processMessageElements(sourceElements, newId, session, config, lo
   let mediaIndex = 0;
   async function transform(elements) {
     const result = [];
-    const typeMap = { "img": "image", "image": "image", "video": "video", "audio": "audio", "file": "file", "text": "text", "at": "at", "forward": "forward" };
+    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" };
     for (const el of elements) {
       const type = typeMap[el.type];
@@ -420,29 +426,29 @@ async function processMessageElements(sourceElements, newId, session, config, lo
       if (type === "text" && el.attrs.content?.trim()) {
         result.push({ type: "text", content: el.attrs.content.trim() });
       } else if (type === "at" && el.attrs.id) {
-        if (config.debug) logger2.info(`发现 [at] 元素，ID: "${el.attrs.id}"`);
         result.push({ type: "at", content: el.attrs.id });
+      } else if (type === "reply" && el.attrs.id) {
+        result.push({ type: "reply", content: el.attrs.id });
       } else if (type === "forward" && Array.isArray(el.attrs.content)) {
-        if (config.debug) logger2.info(`发现 [forward] 元素，开始解析 el.attrs.content...`);
-        const allChildElements = [];
+        const forwardNodes = [];
         for (const node of el.attrs.content) {
-          const senderInfo = `${node.sender?.nickname || node.sender?.user_id}:`;
-          allChildElements.push({ type: "text", content: senderInfo });
-          if (node.raw_message) {
-            const parsedMessage = import_koishi.h.parse(node.raw_message);
-            const transformedMessage = await transform(parsedMessage);
-            allChildElements.push(...transformedMessage);
+          if (!node.message || !Array.isArray(node.message)) continue;
+          const userId = node.sender?.user_id;
+          const userName = node.sender?.nickname;
+          const contentElements = await transform(import_koishi.h.normalize(node.message));
+          if (contentElements.length > 0) {
+            forwardNodes.push({ userId, userName, elements: contentElements });
           }
         }
-        result.push({ type: "forward", content: JSON.stringify(allChildElements) });
+        if (forwardNodes.length > 0) {
+          result.push({ type: "forward", content: JSON.stringify(forwardNodes) });
+        }
       } else if (["image", "video", "audio", "file"].includes(type) && el.attrs.src) {
         let fileIdentifier = el.attrs.src;
-        if (config.debug) logger2.info(`发现 [${type}] 元素，src: "${fileIdentifier}"`);
         if (fileIdentifier.startsWith("http")) {
           const ext = path2.extname(el.attrs.file || "") || defaultExtMap[type];
           const currentMediaIndex = ++mediaIndex;
           const fileName = `${newId}_${currentMediaIndex}_${session.channelId || session.guildId}_${session.userId}${ext}`;
-          if (config.debug) logger2.info(`[${type}] 是远程文件，已加入待保存列表。文件名: "${fileName}"`);
           mediaToSave.push({ sourceUrl: fileIdentifier, fileName });
           fileIdentifier = fileName;
         }
@@ -1064,18 +1070,16 @@ function apply(ctx, config) {
         sourceElements = import_koishi3.h.parse(reply);
       }
       if (config.debug) {
-        logger.info(`获取到的消息内容 (sourceElements): 
+        logger.info(`消息内容: 
 ${JSON.stringify(sourceElements, null, 2)}`);
-        logger.info(`完整的会话对象 (session): 
+        logger.info(`完整会话: 
 ${JSON.stringify(session, null, 2)}`);
       }
       const newId = await getNextCaveId(ctx, getScopeQuery(session, config, false), reusableIds);
       const { finalElementsForDb, mediaToSave } = await processMessageElements(sourceElements, newId, session, config, logger);
       if (config.debug) {
-        logger.info(`提取后数据库元素(finalElementsForDb): 
+        logger.info(`数据库元素: 
 ${JSON.stringify(finalElementsForDb, null, 2)}`);
-        logger.info(`提取后待存媒体(mediaToSave): 
-${JSON.stringify(mediaToSave, null, 2)}`);
       }
       if (finalElementsForDb.length === 0) return "无可添加内容";
       const textHashesToStore = [];

package/package.json

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