koishi-plugin-echo-cave 1.19.1 → 1.19.3

package/lib/index.cjs

@@ -116,7 +116,6 @@ var require_zh_CN2 = __commonJS({
           description: "\u5C06\u6D88\u606F\u5B58\u5165\u56DE\u58F0\u6D1E",
           messages: {
             noMsgQuoted: "\u{1F4A1} \u8BF7\u5F15\u7528\u4E00\u6761\u6D88\u606F\u540E\u518D\u4F7F\u7528\u6B64\u547D\u4EE4\uFF01",
-            existingMsg: "\u267B\uFE0F \u8BE5\u6D88\u606F\u5DF2\u5B58\u5728\u4E8E\u56DE\u58F0\u6D1E\u7A74\u4E2D\uFF01",
             msgSaved: "\u2705 \u56DE\u58F0\u6D1E\u6D88\u606F\u5DF2\u6210\u529F\u5B58\u5165\uFF0C\u6D88\u606F ID\uFF1A{0}",
             msgFailedToSave: "\u274C \u56DE\u58F0\u6D1E\u4FDD\u5B58\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\uFF01"
           }
@@ -351,6 +350,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;
 }
@@ -421,23 +433,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}`);
@@ -540,11 +559,6 @@ async function addCave(ctx, session, cfg, userIds) {
     }
     content = JSON.stringify(await processMessageContent(ctx, msgJson, cfg));
   }
-  await ctx.database.get("echo_cave_v2", { content }).then((existing) => {
-    if (existing) {
-      return session.text(".existingMsg");
-    }
-  });
   try {
     const result = await ctx.database.create("echo_cave_v2", {
       channelId,
@@ -727,7 +741,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) {

package/package.json

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