koishi-plugin-best-cave 2.3.14 → 2.3.16

package/lib/Utils.d.ts

@@ -9,9 +9,10 @@ import { PendManager } from './PendManager';
  * @param config 插件配置。
  * @param fileManager 文件管理器实例。
  * @param logger 日志记录器实例。
- * @returns 包含 h() 元素和字符串的消息数组。
+ * @param platform 目标平台名称 (e.g., 'onebot')。
+ * @returns 包含多条消息的数组，每条消息是一个 (string | h)[] 数组。
  */
-export declare function buildCaveMessage(cave: CaveObject, config: Config, fileManager: FileManager, logger: Logger): Promise<(string | h)[]>;
+export declare function buildCaveMessage(cave: CaveObject, config: Config, fileManager: FileManager, logger: Logger, platform?: string): Promise<(string | h)[][]>;
 /**
  * @description 清理数据库中标记为 'delete' 状态的回声洞及其关联文件和哈希。
  * @param ctx Koishi 上下文。

package/lib/index.d.ts

@@ -3,12 +3,20 @@ import { CaveHashObject } from './HashManager';
 export declare const name = "best-cave";
 export declare const inject: string[];
 export declare const usage = "\n<div style=\"border-radius: 10px; border: 1px solid #ddd; padding: 16px; margin-bottom: 20px; box-shadow: 0 2px 5px rgba(0,0,0,0.1);\">\n  <h2 style=\"margin-top: 0; color: #4a6ee0;\">\uD83D\uDCCC \u63D2\u4EF6\u8BF4\u660E</h2>\n  <p>\uD83D\uDCD6 <strong>\u4F7F\u7528\u6587\u6863</strong>\uFF1A\u8BF7\u70B9\u51FB\u5DE6\u4E0A\u89D2\u7684 <strong>\u63D2\u4EF6\u4E3B\u9875</strong> \u67E5\u770B\u63D2\u4EF6\u4F7F\u7528\u6587\u6863</p>\n  <p>\uD83D\uDD0D <strong>\u66F4\u591A\u63D2\u4EF6</strong>\uFF1A\u53EF\u8BBF\u95EE <a href=\"https://github.com/YisRime\" style=\"color:#4a6ee0;text-decoration:none;\">\u82E1\u6DDE\u7684 GitHub</a> \u67E5\u770B\u672C\u4EBA\u7684\u6240\u6709\u63D2\u4EF6</p>\n</div>\n<div style=\"border-radius: 10px; border: 1px solid #ddd; padding: 16px; margin-bottom: 20px; box-shadow: 0 2px 5px rgba(0,0,0,0.1);\">\n  <h2 style=\"margin-top: 0; color: #e0574a;\">\u2764\uFE0F \u652F\u6301\u4E0E\u53CD\u9988</h2>\n  <p>\uD83C\uDF1F \u559C\u6B22\u8FD9\u4E2A\u63D2\u4EF6\uFF1F\u8BF7\u5728 <a href=\"https://github.com/YisRime\" style=\"color:#e0574a;text-decoration:none;\">GitHub</a> \u4E0A\u7ED9\u6211\u4E00\u4E2A Star\uFF01</p>\n  <p>\uD83D\uDC1B \u9047\u5230\u95EE\u9898\uFF1F\u8BF7\u901A\u8FC7 <strong>Issues</strong> \u63D0\u4EA4\u53CD\u9988\uFF0C\u6216\u52A0\u5165 QQ \u7FA4 <a href=\"https://qm.qq.com/q/PdLMx9Jowq\" style=\"color:#e0574a;text-decoration:none;\"><strong>855571375</strong></a> \u8FDB\u884C\u4EA4\u6D41</p>\n</div>\n";
+/**
+ * @description 存储在合并转发中的单个节点的数据结构。
+ */
+export interface ForwardNode {
+    userId: string;
+    userName: string;
+    elements: StoredElement[];
+}
 /**
  * @description 存储在数据库中的单个消息元素。
  */
 export interface StoredElement {
     type: 'text' | 'image' | 'video' | 'audio' | 'file' | 'at' | 'forward' | 'reply';
-    content?: string;
+    content?: string | ForwardNode[];
     file?: string;
 }
 /**

package/lib/index.js

@@ -292,7 +292,7 @@ var import_koishi2 = require("koishi");
 var import_koishi = require("koishi");
 var path2 = __toESM(require("path"));
 var mimeTypeMap = { ".png": "image/png", ".jpg": "image/jpeg", ".jpeg": "image/jpeg", ".gif": "image/gif", ".mp4": "video/mp4", ".mp3": "audio/mpeg", ".webp": "image/webp" };
-async function buildCaveMessage(cave, config, fileManager, logger2) {
+async function buildCaveMessage(cave, config, fileManager, logger2, platform) {
   async function transformToH(elements) {
     return Promise.all(elements.map(async (el) => {
       if (el.type === "text") return import_koishi.h.text(el.content);
@@ -300,7 +300,7 @@ async function buildCaveMessage(cave, config, fileManager, logger2) {
       if (el.type === "reply") return (0, import_koishi.h)("reply", { id: el.content });
       if (el.type === "forward") {
         try {
-          const forwardNodes = JSON.parse(el.content || "[]");
+          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);
@@ -337,11 +337,31 @@ async function buildCaveMessage(cave, config, fileManager, logger2) {
   const caveHElements = await transformToH(cave.elements);
   const replacements = { id: cave.id.toString(), name: cave.userName };
   const [header, footer] = config.caveFormat.split("|", 2).map((part) => part.replace(/\{id\}|\{name\}/g, (match) => replacements[match.slice(1, -1)]).trim());
-  const finalMessage = [];
-  if (header) finalMessage.push(header + "\n");
-  finalMessage.push(...caveHElements);
-  if (footer) finalMessage.push("\n" + footer);
-  return finalMessage;
+  const problematicTypes = ["video", "audio", "file", "forward"];
+  const placeholderMap = { video: "[视频]", audio: "[音频]", file: "[文件]", forward: "[合并转发]" };
+  const containsProblematic = platform === "onebot" && caveHElements.some((el) => problematicTypes.includes(el.type));
+  if (!containsProblematic) {
+    const finalMessage = [];
+    if (header) finalMessage.push(header + "\n");
+    finalMessage.push(...caveHElements);
+    if (footer) finalMessage.push("\n" + footer);
+    return [finalMessage.length > 0 ? finalMessage : []];
+  }
+  const initialMessageContent = [];
+  const followUpMessages = [];
+  for (const el of caveHElements) {
+    if (problematicTypes.includes(el.type)) {
+      initialMessageContent.push(import_koishi.h.text(placeholderMap[el.type]));
+      followUpMessages.push([el]);
+    } else {
+      initialMessageContent.push(el);
+    }
+  }
+  const finalInitialMessage = [];
+  if (header) finalInitialMessage.push(header + "\n");
+  finalInitialMessage.push(...initialMessageContent);
+  if (footer) finalInitialMessage.push("\n" + footer);
+  return [finalInitialMessage, ...followUpMessages].filter((msg) => msg.length > 0);
 }
 __name(buildCaveMessage, "buildCaveMessage");
 async function cleanupPendingDeletions(ctx, fileManager, logger2, reusableIds) {
@@ -458,7 +478,7 @@ async function processMessageElements(sourceElements, newId, session, config, lo
           }
         }
         if (forwardNodes.length > 0) {
-          result.push({ type: "forward", content: JSON.stringify(forwardNodes) });
+          result.push({ type: "forward", content: forwardNodes });
         }
       } else if (["image", "video", "audio", "file"].includes(type) && el.attrs.src) {
         let fileIdentifier = el.attrs.src;
@@ -564,7 +584,12 @@ var PendManager = class {
         const [targetCave] = await this.ctx.database.get("cave", { id });
         if (!targetCave) return `回声洞（${id}）不存在`;
         if (targetCave.status !== "pending") return `回声洞（${id}）无需审核`;
-        return [`待审核`, ...await buildCaveMessage(targetCave, this.config, this.fileManager, this.logger)];
+        await session.send("待审核");
+        const caveMessages = await buildCaveMessage(targetCave, this.config, this.fileManager, this.logger, session.platform);
+        for (const message of caveMessages) {
+          if (message.length > 0) await session.send(import_koishi2.h.normalize(message));
+        }
+        return;
       }
       const pendingCaves = await this.ctx.database.get("cave", { status: "pending" }, { fields: ["id"] });
       if (!pendingCaves.length) return "当前没有需要审核的回声洞";
@@ -608,8 +633,12 @@ ${pendingCaves.map((c) => c.id).join("|")}`;
       return;
     }
     try {
-      const pendMessage = [`待审核`, ...await buildCaveMessage(cave, this.config, this.fileManager, this.logger)];
-      await this.ctx.broadcast([this.config.adminChannel], import_koishi2.h.normalize(pendMessage));
+      const [platform] = this.config.adminChannel.split(":", 1);
+      const caveMessages = await buildCaveMessage(cave, this.config, this.fileManager, this.logger, platform);
+      await this.ctx.broadcast([this.config.adminChannel], "待审核");
+      for (const message of caveMessages) {
+        if (message.length > 0) await this.ctx.broadcast([this.config.adminChannel], import_koishi2.h.normalize(message));
+      }
     } catch (error) {
       this.logger.error(`发送回声洞（${cave.id}）审核消息失败:`, error);
     }
@@ -1067,7 +1096,10 @@ function apply(ctx, config) {
       const randomId = candidates[Math.floor(Math.random() * candidates.length)].id;
       const [randomCave] = await ctx.database.get("cave", { ...query, id: randomId });
       updateCooldownTimestamp(session, config, lastUsed);
-      return buildCaveMessage(randomCave, config, fileManager, logger);
+      const messages = await buildCaveMessage(randomCave, config, fileManager, logger, session.platform);
+      for (const message of messages) {
+        if (message.length > 0) await session.send(import_koishi3.h.normalize(message));
+      }
     } catch (error) {
       logger.error("随机获取回声洞失败:", error);
       return "随机获取回声洞失败";
@@ -1101,7 +1133,7 @@ ${JSON.stringify(finalElementsForDb, null, 2)}`);
       if (finalElementsForDb.length === 0) return "无可添加内容";
       const textHashesToStore = [];
       if (hashManager) {
-        const combinedText = finalElementsForDb.filter((el) => el.type === "text" && el.content).map((el) => el.content).join(" ");
+        const combinedText = finalElementsForDb.filter((el) => el.type === "text" && typeof el.content === "string").map((el) => el.content).join(" ");
         if (combinedText) {
           const newSimhash = hashManager.generateTextSimhash(combinedText);
           if (newSimhash) {
@@ -1152,7 +1184,10 @@ ${JSON.stringify(finalElementsForDb, null, 2)}`);
       const [targetCave] = await ctx.database.get("cave", { ...getScopeQuery(session, config), id });
       if (!targetCave) return `回声洞（${id}）不存在`;
       updateCooldownTimestamp(session, config, lastUsed);
-      return buildCaveMessage(targetCave, config, fileManager, logger);
+      const messages = await buildCaveMessage(targetCave, config, fileManager, logger, session.platform);
+      for (const message of messages) {
+        if (message.length > 0) await session.send(import_koishi3.h.normalize(message));
+      }
     } catch (error) {
       logger.error(`查看回声洞（${id}）失败:`, error);
       return "查看失败，请稍后再试";
@@ -1167,9 +1202,12 @@ ${JSON.stringify(finalElementsForDb, null, 2)}`);
       const isAdmin = session.channelId === config.adminChannel?.split(":")[1];
       if (!isAuthor && !isAdmin) return "你没有权限删除这条回声洞";
       await ctx.database.upsert("cave", [{ id, status: "delete" }]);
-      const caveMessage = await buildCaveMessage(targetCave, config, fileManager, logger);
+      const caveMessages = await buildCaveMessage(targetCave, config, fileManager, logger, session.platform);
       cleanupPendingDeletions(ctx, fileManager, logger, reusableIds);
-      return [`已删除`, ...caveMessage];
+      await session.send("已删除");
+      for (const message of caveMessages) {
+        if (message.length > 0) await session.send(import_koishi3.h.normalize(message));
+      }
     } catch (error) {
       logger.error(`标记回声洞（${id}）失败:`, error);
       return "删除失败，请稍后再试";

package/package.json

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