koishi-plugin-echo-cave 1.19.2 → 1.20.0

package/lib/config/config.d.ts

@@ -10,5 +10,6 @@ export interface Config {
     maxFileSize?: number;
     maxRecordSize?: number;
     useBase64ForMedia?: boolean;
+    sendAllAsForwardMsg?: boolean;
 }
 export declare const Config: Schema<Config>;

package/lib/index.cjs

@@ -42,7 +42,8 @@ var require_zh_CN = __commonJS({
       maxVideoSize: "\u6700\u5927\u89C6\u9891\u5927\u5C0F (MB)",
       maxFileSize: "\u6700\u5927\u6587\u4EF6\u5927\u5C0F (MB)",
       maxRecordSize: "\u6700\u5927\u5F55\u97F3\u5927\u5C0F (MB)",
-      useBase64ForMedia: "\u662F\u5426\u4F7F\u7528 Base64 \u7F16\u7801\u53D1\u9001\u5A92\u4F53\u6587\u4EF6\uFF0C\u5F00\u542F\u540E\u5C06\u8BFB\u53D6 base64 \u7F16\u7801\u53D1\u9001\u800C\u4E0D\u662F\u4F7F\u7528 file uri"
+      useBase64ForMedia: "\u662F\u5426\u4F7F\u7528 Base64 \u7F16\u7801\u53D1\u9001\u5A92\u4F53\u6587\u4EF6\uFF0C\u5F00\u542F\u540E\u5C06\u8BFB\u53D6 base64 \u7F16\u7801\u53D1\u9001\u800C\u4E0D\u662F\u4F7F\u7528 file uri",
+      sendAllAsForwardMsg: "\u662F\u5426\u5C06\u6240\u6709\u6D88\u606F\u4EE5\u8F6C\u53D1\u6D88\u606F\u5F62\u5F0F\u53D1\u9001\uFF0C\u5F00\u542F\u540E\u666E\u901A\u6D88\u606F\u4E5F\u4F1A\u8F6C\u6362\u4E3A\u8F6C\u53D1\u6D88\u606F\u683C\u5F0F"
     };
   }
 });
@@ -350,6 +351,19 @@ async function convertFileUriToBase64(ctx, element) {
       ctx.logger.error(`Failed to convert ${element.type} to base64: ${err}`);
       return element;
     }
+  } else if (element.type === "node") {
+    const processedContent = await Promise.all(
+      element.data.content.map(async (contentElement) => {
+        return await convertFileUriToBase64(ctx, contentElement);
+      })
+    );
+    return {
+      ...element,
+      data: {
+        ...element.data,
+        content: processedContent
+      }
+    };
   }
   return element;
 }
@@ -420,23 +434,30 @@ async function checkAndCleanMediaFiles(ctx, cfg, type) {
   }
 }
 async function deleteMediaFilesFromMessage(ctx, content) {
+  async function processElement(element) {
+    if (element.type === "image" || element.type === "video" || element.type === "file" || element.type === "record") {
+      const fileUri = element.data?.file;
+      if (fileUri && fileUri.startsWith("file:///")) {
+        const filePath = decodeURIComponent(fileUri.replace("file:///", ""));
+        try {
+          await import_node_fs.promises.access(filePath);
+          await import_node_fs.promises.unlink(filePath);
+          ctx.logger.info(`Deleted media file: ${filePath}`);
+        } catch (err) {
+          ctx.logger.warn(`Failed to delete media file: ${filePath}, error: ${err}`);
+        }
+      }
+    } else if (element.type === "node" && element.data?.content) {
+      for (const contentElement of element.data.content) {
+        await processElement(contentElement);
+      }
+    }
+  }
   try {
     const elements = JSON.parse(content);
     const mediaElements = Array.isArray(elements) ? elements : [elements];
     for (const element of mediaElements) {
-      if (element.type === "image" || element.type === "video" || element.type === "file" || element.type === "record") {
-        const fileUri = element.data?.file;
-        if (fileUri && fileUri.startsWith("file:///")) {
-          const filePath = decodeURIComponent(fileUri.replace("file:///", ""));
-          try {
-            await import_node_fs.promises.access(filePath);
-            await import_node_fs.promises.unlink(filePath);
-            ctx.logger.info(`Deleted media file: ${filePath}`);
-          } catch (err) {
-            ctx.logger.warn(`Failed to delete media file: ${filePath}, error: ${err}`);
-          }
-        }
-      }
+      await processElement(element);
     }
   } catch (err) {
     ctx.logger.error(`Failed to parse message content when deleting media: ${err}`);
@@ -688,7 +709,9 @@ async function sendCaveMsg(ctx, session, caveMsg, cfg) {
     nl: "\n"
   };
   const TEMPLATE_COUNT = 5;
-  if (caveMsg.type === "forward") {
+  const isActualForward = content.some((item) => item.type === "node");
+  const shouldSendAsForward = cfg.sendAllAsForwardMsg || caveMsg.type === "forward" && isActualForward;
+  if (shouldSendAsForward) {
     const availableTemplates2 = [];
     for (let i = 0; i < TEMPLATE_COUNT; i++) {
       const template = session.text(`echo-cave.templates.forward.${i}`, templateData);
@@ -702,7 +725,21 @@ async function sendCaveMsg(ctx, session, caveMsg, cfg) {
     }
     const chosenTemplate2 = availableTemplates2[Math.floor(Math.random() * availableTemplates2.length)];
     await session.onebot.sendGroupMsg(channelId, [createTextMsg(chosenTemplate2)]);
-    await session.onebot.sendGroupForwardMsg(channelId, content);
+    if (!isActualForward) {
+      const forwardContent = [
+        {
+          type: "node",
+          data: {
+            user_id: caveMsg.originUserId,
+            nickname: originName,
+            content
+          }
+        }
+      ];
+      await session.onebot.sendGroupForwardMsg(channelId, forwardContent);
+    } else {
+      await session.onebot.sendGroupForwardMsg(channelId, content);
+    }
     return;
   }
   const availableTemplates = [];
@@ -721,7 +758,7 @@ async function sendCaveMsg(ctx, session, caveMsg, cfg) {
   const last = content.at(-1);
   const needsNewline = last?.type === "text";
   content.unshift(createTextMsg(chosenTemplate.prefix + "\n"));
-  content.push(createTextMsg(`${needsNewline ? "\n\n" : ""}${chosenTemplate.suffix}`));
+  content.push(createTextMsg(`${needsNewline ? "\n" : ""}${chosenTemplate.suffix}`));
   await session.onebot.sendGroupMsg(channelId, content);
 }
 function formatDate(date) {
@@ -879,7 +916,8 @@ var Config = import_koishi2.Schema.object({
   maxVideoSize: import_koishi2.Schema.number().default(512),
   maxFileSize: import_koishi2.Schema.number().default(512),
   maxRecordSize: import_koishi2.Schema.number().default(512),
-  useBase64ForMedia: import_koishi2.Schema.boolean().default(false)
+  useBase64ForMedia: import_koishi2.Schema.boolean().default(false),
+  sendAllAsForwardMsg: import_koishi2.Schema.boolean().default(false)
 }).i18n({
   "zh-CN": require_zh_CN()
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-echo-cave",
   "description": "Group echo cave",
-  "version": "1.19.2",
+  "version": "1.20.0",
   "main": "lib/index.cjs",
   "typings": "lib/index.d.ts",
   "type": "module",