koishi-plugin-echo-cave 1.19.2 → 1.19.3

package/lib/index.cjs

@@ -350,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;
 }
@@ -420,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}`);
@@ -721,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.2",
+  "version": "1.19.3",
   "main": "lib/index.cjs",
   "typings": "lib/index.d.ts",
   "type": "module",