koishi-plugin-best-cave 2.0.5 → 2.0.7

package/lib/index.js

@@ -38,6 +38,7 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 var import_koishi2 = require("koishi");
+var path3 = __toESM(require("path"));
 
 // src/FileManager.ts
 var import_client_s3 = require("@aws-sdk/client-s3");
@@ -45,9 +46,10 @@ var fs = __toESM(require("fs/promises"));
 var path = __toESM(require("path"));
 var FileManager = class {
   /**
-   * @param baseDir - Koishi 应用的基础数据目录 (ctx.baseDir)。
-   * @param config - 插件的配置对象。
-   * @param logger - 日志记录器实例。
+   * @constructor
+   * @param baseDir Koishi 应用的基础数据目录 (ctx.baseDir)。
+   * @param config 插件的配置对象。
+   * @param logger 日志记录器实例。
    */
   constructor(baseDir, config, logger2) {
     this.logger = logger2;
@@ -72,55 +74,27 @@ var FileManager = class {
   s3Client;
   s3Bucket;
   /**
-   * 确保本地资源目录存在，若不存在则以递归方式创建。
-   * @private
-   */
-  async ensureDirectory() {
-    try {
-      await fs.mkdir(this.resourceDir, { recursive: true });
-    } catch (error) {
-      this.logger.error(`Failed to create resource directory ${this.resourceDir}:`, error);
-      throw error;
-    }
-  }
-  /**
-   * 获取给定文件名的完整本地路径。
-   * @param fileName - 文件名。
-   * @returns 文件的绝对路径。
-   * @private
-   */
-  getFullPath(fileName) {
-    return path.join(this.resourceDir, fileName);
-  }
-  /**
-   * 使用文件锁安全地执行一个异步文件操作，防止对同一文件的并发访问。
-   * @template T - 异步操作的返回类型。
-   * @param fileName - 需要加锁的文件名。
-   * @param operation - 要执行的异步函数。
+   * @description 使用文件锁安全地执行异步文件操作，防止并发读写冲突。
+   * @template T 异步操作的返回类型。
+   * @param fullPath 需要加锁的文件的完整路径。
+   * @param operation 要执行的异步函数。
    * @returns 返回异步操作的结果。
-   * @private
    */
-  async withLock(fileName, operation) {
-    const fullPath = this.getFullPath(fileName);
+  async withLock(fullPath, operation) {
     while (this.locks.has(fullPath)) {
-      await this.locks.get(fullPath).catch(() => {
-      });
+      await this.locks.get(fullPath);
     }
-    const promise = operation();
+    const promise = operation().finally(() => {
+      this.locks.delete(fullPath);
+    });
     this.locks.set(fullPath, promise);
-    try {
-      return await promise;
-    } finally {
-      if (this.locks.get(fullPath) === promise) {
-        this.locks.delete(fullPath);
-      }
-    }
+    return promise;
   }
   /**
-   * 保存文件，自动路由到 S3 或本地存储。
-   * @param fileName - 文件名，将用作 S3 Key 或本地文件名。
-   * @param data - 要写入的 Buffer 数据。
-   * @returns 返回保存时使用的文件名。
+   * @description 保存文件，自动选择 S3 或本地存储。
+   * @param fileName 用作 S3 Key 或本地文件名。
+   * @param data 要写入的 Buffer 数据。
+   * @returns 返回保存时使用的文件名/标识符。
    */
   async saveFile(fileName, data) {
     if (this.s3Client) {
@@ -129,55 +103,52 @@ var FileManager = class {
         Key: fileName,
         Body: data,
         ACL: "public-read"
+        // 默认为公开可读
       });
       await this.s3Client.send(command);
     } else {
-      await this.ensureDirectory();
-      const filePath = this.getFullPath(fileName);
-      await this.withLock(fileName, () => fs.writeFile(filePath, data));
+      await fs.mkdir(this.resourceDir, { recursive: true }).catch((error) => {
+        this.logger.error(`创建资源目录失败 ${this.resourceDir}:`, error);
+        throw error;
+      });
+      const filePath = path.join(this.resourceDir, fileName);
+      await this.withLock(filePath, () => fs.writeFile(filePath, data));
     }
     return fileName;
   }
   /**
-   * 读取文件，自动从 S3 或本地存储获取。
-   * @param fileName - 要读取的文件名。
+   * @description 读取文件，自动从 S3 或本地存储读取。
+   * @param fileName 要读取的文件名/标识符。
    * @returns 文件的 Buffer 数据。
    */
   async readFile(fileName) {
     if (this.s3Client) {
-      const command = new import_client_s3.GetObjectCommand({
-        Bucket: this.s3Bucket,
-        Key: fileName
-      });
+      const command = new import_client_s3.GetObjectCommand({ Bucket: this.s3Bucket, Key: fileName });
       const response = await this.s3Client.send(command);
-      const byteArray = await response.Body.transformToByteArray();
-      return Buffer.from(byteArray);
+      return Buffer.from(await response.Body.transformToByteArray());
     } else {
-      const filePath = this.getFullPath(fileName);
-      return this.withLock(fileName, () => fs.readFile(filePath));
+      const filePath = path.join(this.resourceDir, fileName);
+      return this.withLock(filePath, () => fs.readFile(filePath));
     }
   }
   /**
-   * 删除文件，自动从 S3 或本地存储删除。
-   * @param fileName - 要删除的文件名。
+   * @description 删除文件，自动从 S3 或本地删除。
+   * @param fileIdentifier 要删除的文件名/标识符。
    */
-  async deleteFile(fileName) {
+  async deleteFile(fileIdentifier) {
     if (this.s3Client) {
-      const command = new import_client_s3.DeleteObjectCommand({
-        Bucket: this.s3Bucket,
-        Key: fileName
-      });
+      const command = new import_client_s3.DeleteObjectCommand({ Bucket: this.s3Bucket, Key: fileIdentifier });
       await this.s3Client.send(command).catch((err) => {
-        this.logger.warn(`删除文件 ${fileName} 失败:`, err);
+        this.logger.warn(`删除 S3 文件 ${fileIdentifier} 失败:`, err);
       });
     } else {
-      const filePath = this.getFullPath(fileName);
-      await this.withLock(fileName, async () => {
+      const filePath = path.join(this.resourceDir, fileIdentifier);
+      await this.withLock(filePath, async () => {
         try {
           await fs.unlink(filePath);
         } catch (error) {
           if (error.code !== "ENOENT") {
-            this.logger.warn(`删除文件 ${fileName} 失败:`, error);
+            this.logger.warn(`删除本地文件 ${filePath} 失败:`, error);
           }
         }
       });
@@ -188,37 +159,42 @@ var FileManager = class {
 // src/ProfileManager.ts
 var ProfileManager = class {
   /**
-   * @param ctx - Koishi 上下文，用于数据库交互。
+   * @constructor
+   * @param ctx - Koishi 上下文，用于初始化数据库模型。
    */
   constructor(ctx) {
     this.ctx = ctx;
     this.ctx.model.extend("cave_user", {
       userId: "string",
+      // 用户 ID
       nickname: "string"
+      // 用户自定义昵称
     }, {
       primary: "userId"
+      // 保证每个用户只有一条昵称记录。
     });
   }
   static {
     __name(this, "ProfileManager");
   }
   /**
-   * 注册与用户昵称相关的 `.profile` 子命令。
-   * @param cave - 主 `cave` 命令实例，用于挂载子命令。
+   * @description 注册 `.profile` 子命令，用于管理用户昵称。
+   * @param cave - 主 `cave` 命令实例。
    */
   registerCommands(cave) {
-    cave.subcommand(".profile [nickname:text]", "设置显示昵称").usage("设置你在回声洞中显示的昵称。不提供昵称则清除记录。").action(async ({ session }, nickname) => {
+    cave.subcommand(".profile [nickname:text]", "设置显示昵称").usage("设置你在回声洞中显示的昵称。若不提供昵称，则清除现有昵称。").action(async ({ session }, nickname) => {
       const trimmedNickname = nickname?.trim();
-      if (!trimmedNickname) {
+      if (trimmedNickname) {
+        await this.setNickname(session.userId, trimmedNickname);
+        return `昵称已更新为：${trimmedNickname}`;
+      } else {
         await this.clearNickname(session.userId);
         return "昵称已清除";
       }
-      await this.setNickname(session.userId, trimmedNickname);
-      return `昵称已更新为：${trimmedNickname}`;
     });
   }
   /**
-   * 设置或更新指定用户的昵称。
+   * @description 设置或更新指定用户的昵称。
    * @param userId - 目标用户的 ID。
    * @param nickname - 要设置的新昵称。
    */
@@ -226,16 +202,16 @@ var ProfileManager = class {
     await this.ctx.database.upsert("cave_user", [{ userId, nickname }]);
   }
   /**
-   * 获取指定用户的昵称。
+   * @description 获取指定用户的昵称。
    * @param userId - 目标用户的 ID。
-   * @returns 返回用户的昵称字符串，如果用户未设置则返回 null。
+   * @returns 返回用户的昵称字符串，如果未设置则返回 null。
    */
   async getNickname(userId) {
-    const [profile] = await this.ctx.database.get("cave_user", { userId });
-    return profile?.nickname || null;
+    const profile = await this.ctx.database.get("cave_user", { userId });
+    return profile[0]?.nickname ?? null;
   }
   /**
-   * 清除指定用户的昵称设置。
+   * @description 清除指定用户的昵称设置。
    * @param userId - 目标用户的 ID。
    */
   async clearNickname(userId) {
@@ -243,13 +219,108 @@ var ProfileManager = class {
   }
 };
 
+// src/Utils.ts
+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" };
+function storedFormatToHElements(elements) {
+  return elements.map((el) => {
+    if (el.type === "text") return import_koishi.h.text(el.content);
+    if (["image", "video", "audio", "file"].includes(el.type)) return (0, import_koishi.h)(el.type, { src: el.file });
+    return null;
+  }).filter(Boolean);
+}
+__name(storedFormatToHElements, "storedFormatToHElements");
+async function buildCaveMessage(cave, config, fileManager, logger2) {
+  const caveHElements = storedFormatToHElements(cave.elements);
+  const processedElements = await Promise.all(caveHElements.map(async (element) => {
+    const isMedia = ["image", "video", "audio", "file"].includes(element.type);
+    const fileName = element.attrs.src;
+    if (!isMedia || !fileName) return element;
+    if (config.enableS3 && config.publicUrl) {
+      const fullUrl = config.publicUrl.endsWith("/") ? `${config.publicUrl}${fileName}` : `${config.publicUrl}/${fileName}`;
+      return (0, import_koishi.h)(element.type, { ...element.attrs, src: fullUrl });
+    }
+    if (config.localPath) {
+      const fileUri = `file://${path2.join(config.localPath, fileName)}`;
+      return (0, import_koishi.h)(element.type, { ...element.attrs, src: fileUri });
+    }
+    try {
+      const data = await fileManager.readFile(fileName);
+      const ext = path2.extname(fileName).toLowerCase();
+      const mimeType = mimeTypeMap[ext] || "application/octet-stream";
+      return (0, import_koishi.h)(element.type, { ...element.attrs, src: `data:${mimeType};base64,${data.toString("base64")}` });
+    } catch (error) {
+      logger2.warn(`转换文件 ${fileName} 为 Base64 失败:`, error);
+      return (0, import_koishi.h)("p", {}, `[${element.type}]`);
+    }
+  }));
+  const finalMessage = [];
+  const [headerFormat, footerFormat = ""] = config.caveFormat.split("|");
+  const replacements = { id: cave.id.toString(), name: cave.userName };
+  const headerText = headerFormat.replace(/\{id\}|\{name\}/g, (match) => replacements[match.slice(1, -1)]);
+  if (headerText.trim()) finalMessage.push(headerText);
+  finalMessage.push(...processedElements);
+  const footerText = footerFormat.replace(/\{id\}|\{name\}/g, (match) => replacements[match.slice(1, -1)]);
+  if (footerText.trim()) finalMessage.push(footerText);
+  return finalMessage;
+}
+__name(buildCaveMessage, "buildCaveMessage");
+async function cleanupPendingDeletions(ctx, fileManager, logger2) {
+  try {
+    const cavesToDelete = await ctx.database.get("cave", { status: "delete" });
+    if (!cavesToDelete.length) return;
+    for (const cave of cavesToDelete) {
+      const deletePromises = cave.elements.filter((el) => el.file).map((el) => fileManager.deleteFile(el.file));
+      await Promise.all(deletePromises);
+      await ctx.database.remove("cave", { id: cave.id });
+    }
+  } catch (error) {
+    logger2.error("清理回声洞时发生错误:", error);
+  }
+}
+__name(cleanupPendingDeletions, "cleanupPendingDeletions");
+function getScopeQuery(session, config) {
+  const baseQuery = { status: "active" };
+  return config.perChannel && session.channelId ? { ...baseQuery, channelId: session.channelId } : baseQuery;
+}
+__name(getScopeQuery, "getScopeQuery");
+async function getNextCaveId(ctx, query = {}) {
+  const allCaveIds = (await ctx.database.get("cave", query, { fields: ["id"] })).map((c) => c.id);
+  const existingIds = new Set(allCaveIds);
+  let newId = 1;
+  while (existingIds.has(newId)) {
+    newId++;
+  }
+  return newId;
+}
+__name(getNextCaveId, "getNextCaveId");
+function checkCooldown(session, config, lastUsed) {
+  if (config.coolDown <= 0 || !session.channelId || config.adminUsers.includes(session.userId)) return null;
+  const now = Date.now();
+  const lastTime = lastUsed.get(session.channelId) || 0;
+  if (now - lastTime < config.coolDown * 1e3) {
+    const waitTime = Math.ceil((config.coolDown * 1e3 - (now - lastTime)) / 1e3);
+    return `指令冷却中，请在 ${waitTime} 秒后重试`;
+  }
+  return null;
+}
+__name(checkCooldown, "checkCooldown");
+function updateCooldownTimestamp(session, config, lastUsed) {
+  if (config.coolDown > 0 && session.channelId) {
+    lastUsed.set(session.channelId, Date.now());
+  }
+}
+__name(updateCooldownTimestamp, "updateCooldownTimestamp");
+
 // src/DataManager.ts
 var DataManager = class {
   /**
-   * @param ctx - Koishi 上下文，用于数据库操作。
-   * @param config - 插件配置对象。
-   * @param fileManager - 文件管理器实例，用于读写导入/导出文件。
-   * @param logger - 日志记录器实例。
+   * @constructor
+   * @param ctx Koishi 上下文，用于数据库操作。
+   * @param config 插件配置。
+   * @param fileManager 文件管理器实例。
+   * @param logger 日志记录器实例。
    */
   constructor(ctx, config, fileManager, logger2) {
     this.ctx = ctx;
@@ -261,8 +332,8 @@ var DataManager = class {
     __name(this, "DataManager");
   }
   /**
-   * 注册与数据导入导出相关的 `.export` 和 `.import` 子命令。
-   * @param cave - 主 `cave` 命令实例，用于挂载子命令。
+   * @description 注册 `.export` 和 `.import` 子命令。
+   * @param cave - 主 `cave` 命令实例。
    */
   registerCommands(cave) {
     cave.subcommand(".export", "导出回声洞数据").usage("将所有回声洞数据导出到 cave_export.json。").action(async ({ session }) => {
@@ -287,8 +358,8 @@ var DataManager = class {
     });
   }
   /**
-   * 导出所有状态为 'active' 的回声洞数据到 `cave_export.json` 文件。
-   * @returns 一个描述导出结果的字符串消息。
+   * @description 导出所有 'active' 状态的回声洞数据到 `cave_export.json`。
+   * @returns 描述导出结果的消息字符串。
    */
   async exportData() {
     const fileName = "cave_export.json";
@@ -299,197 +370,46 @@ var DataManager = class {
     return `成功导出 ${portableCaves.length} 条数据`;
   }
   /**
-   * 从 `cave_import.json` 文件导入回声洞数据。
-   * @returns 一个描述导入结果的字符串消息。
+   * @description 从 `cave_import.json` 文件导入回声洞数据。
+   * @returns 描述导入结果的消息字符串。
    */
   async importData() {
     const fileName = "cave_import.json";
-    let importedData;
+    let importedCaves;
     try {
       const fileContent = await this.fileManager.readFile(fileName);
-      importedData = JSON.parse(fileContent.toString("utf-8"));
-      if (!Array.isArray(importedData)) {
-        throw new Error("导入文件格式非 JSON 数组");
-      }
+      importedCaves = JSON.parse(fileContent.toString("utf-8"));
+      if (!Array.isArray(importedCaves)) throw new Error("导入文件格式无效");
     } catch (error) {
-      return `读取导入文件失败: ${error.message}`;
+      this.logger.error(`读取导入文件失败:`, error);
+      return `读取导入文件失败: ${error.message || "未知错误"}`;
     }
-    const allCaves = await this.ctx.database.get("cave", {}, { fields: ["id"] });
-    const existingIds = new Set(allCaves.map((c) => c.id));
-    let nextId = 1;
-    const cavesToCreate = [];
-    for (const caveData of importedData) {
-      while (existingIds.has(nextId)) {
-        nextId++;
-      }
-      const newId = nextId;
+    let successCount = 0;
+    for (const cave of importedCaves) {
+      const newId = await getNextCaveId(this.ctx, {});
       const newCave = {
-        ...caveData,
+        ...cave,
         id: newId,
-        channelId: caveData.channelId,
+        channelId: cave.channelId || null,
+        // 保证 channelId 存在
         status: "active"
+        // 导入的数据直接设为活跃状态
       };
-      cavesToCreate.push(newCave);
-      existingIds.add(newId);
+      await this.ctx.database.create("cave", newCave);
+      successCount++;
     }
-    if (cavesToCreate.length > 0) {
-      await this.ctx.database.upsert("cave", cavesToCreate);
-    }
-    return `成功导入 ${cavesToCreate.length} 条回声洞数据`;
+    return `成功导入 ${successCount} 条回声洞数据`;
   }
 };
 
-// src/Utils.ts
-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"
-};
-function storedFormatToHElements(elements) {
-  return elements.map((el) => {
-    switch (el.type) {
-      case "text":
-        return import_koishi.h.text(el.content);
-      case "image":
-      case "video":
-      case "audio":
-      case "file":
-        return (0, import_koishi.h)(el.type, { src: el.file });
-      default:
-        return null;
-    }
-  }).filter(Boolean);
-}
-__name(storedFormatToHElements, "storedFormatToHElements");
-async function mediaElementToBase64(element, fileManager, logger2) {
-  const fileName = element.attrs.src;
-  try {
-    const data = await fileManager.readFile(fileName);
-    const ext = path2.extname(fileName).toLowerCase();
-    const mimeType = mimeTypeMap[ext] || "application/octet-stream";
-    return (0, import_koishi.h)(element.type, { ...element.attrs, src: `data:${mimeType};base64,${data.toString("base64")}` });
-  } catch (error) {
-    logger2.warn(`转换本地文件 ${fileName} 为 Base64 失败:`, error);
-    return import_koishi.h.text(`[${element.type}]`);
-  }
-}
-__name(mediaElementToBase64, "mediaElementToBase64");
-async function buildCaveMessage(cave, config, fileManager, logger2) {
-  const caveHElements = storedFormatToHElements(cave.elements);
-  const processedElements = await Promise.all(caveHElements.map((element) => {
-    const isMedia = ["image", "video", "audio", "file"].includes(element.type);
-    const fileName = element.attrs.src;
-    if (!isMedia || !fileName) {
-      return element;
-    }
-    if (config.enableS3 && config.publicUrl) {
-      const fullUrl = new URL(fileName, config.publicUrl.endsWith("/") ? config.publicUrl : `${config.publicUrl}/`).href;
-      return (0, import_koishi.h)(element.type, { ...element.attrs, src: fullUrl });
-    }
-    if (config.localPath) {
-      const fileUri = `file://${path2.join(config.localPath, fileName)}`;
-      return (0, import_koishi.h)(element.type, { ...element.attrs, src: fileUri });
-    }
-    return mediaElementToBase64(element, fileManager, logger2);
-  }));
-  const finalMessage = [];
-  const [headerFormat, footerFormat] = config.caveFormat.split("|");
-  const replacer = /* @__PURE__ */ __name((str) => str.replace("{id}", cave.id.toString()).replace("{name}", cave.userName), "replacer");
-  if (headerFormat?.trim()) finalMessage.push(replacer(headerFormat));
-  finalMessage.push(...processedElements);
-  if (footerFormat?.trim()) finalMessage.push(replacer(footerFormat));
-  return finalMessage;
-}
-__name(buildCaveMessage, "buildCaveMessage");
-function prepareElementsForStorage(sourceElements, newId, channelId, userId) {
-  const finalElementsForDb = [];
-  const mediaToDownload = [];
-  let mediaIndex = 0;
-  const processElement = /* @__PURE__ */ __name((el) => {
-    const elementType = el.type;
-    if (["image", "video", "audio", "file"].includes(elementType) && el.attrs.src) {
-      const fileIdentifier = el.attrs.src;
-      if (fileIdentifier.startsWith("http")) {
-        mediaIndex++;
-        const originalName = el.attrs.file;
-        const defaultExtMap = { "image": ".jpg", "video": ".mp4", "audio": ".mp3", "file": ".dat" };
-        const ext = originalName ? path2.extname(originalName) : "";
-        const finalExt = ext || defaultExtMap[elementType] || ".dat";
-        const generatedFileName = `${newId}_${mediaIndex}_${channelId}_${userId}${finalExt}`;
-        finalElementsForDb.push({ type: elementType, file: generatedFileName });
-        mediaToDownload.push({ url: fileIdentifier, fileName: generatedFileName });
-      } else {
-        finalElementsForDb.push({ type: elementType, file: fileIdentifier });
-      }
-    } else if (elementType === "text" && el.attrs.content?.trim()) {
-      finalElementsForDb.push({ type: "text", content: el.attrs.content.trim() });
-    }
-    if (el.children) {
-      el.children.forEach(processElement);
-    }
-  }, "processElement");
-  sourceElements.forEach(processElement);
-  return { finalElementsForDb, mediaToDownload };
-}
-__name(prepareElementsForStorage, "prepareElementsForStorage");
-async function cleanupPendingDeletions(ctx, fileManager, logger2) {
-  try {
-    const cavesToDelete = await ctx.database.get("cave", { status: "delete" });
-    if (cavesToDelete.length === 0) return;
-    const filesToDelete = cavesToDelete.flatMap(
-      (cave) => cave.elements.filter((el) => el.file).map((el) => el.file)
-    );
-    await Promise.all(filesToDelete.map((file) => fileManager.deleteFile(file)));
-    const idsToRemove = cavesToDelete.map((cave) => cave.id);
-    await ctx.database.remove("cave", { id: { $in: idsToRemove } });
-  } catch (error) {
-    logger2.error("清理回声洞时发生错误:", error);
-  }
-}
-__name(cleanupPendingDeletions, "cleanupPendingDeletions");
-function getScopeQuery(session, config) {
-  const baseQuery = { status: "active" };
-  if (config.perChannel && session.channelId) {
-    return { ...baseQuery, channelId: session.channelId };
-  }
-  return baseQuery;
-}
-__name(getScopeQuery, "getScopeQuery");
-function checkCooldown(session, config, lastUsed) {
-  if (config.coolDown <= 0 || !session.channelId || config.adminUsers.includes(session.userId)) {
-    return null;
-  }
-  const now = Date.now();
-  const lastTime = lastUsed.get(session.channelId) || 0;
-  if (now - lastTime < config.coolDown * 1e3) {
-    const waitTime = Math.ceil((config.coolDown * 1e3 - (now - lastTime)) / 1e3);
-    return `指令冷却中，请在 ${waitTime} 秒后重试`;
-  }
-  return null;
-}
-__name(checkCooldown, "checkCooldown");
-function updateCooldownTimestamp(session, config, lastUsed) {
-  if (config.coolDown > 0 && session.channelId) {
-    lastUsed.set(session.channelId, Date.now());
-  }
-}
-__name(updateCooldownTimestamp, "updateCooldownTimestamp");
-
 // src/ReviewManager.ts
-var APPROVE_ACTIONS = /* @__PURE__ */ new Set(["y", "yes", "pass", "approve"]);
-var REJECT_ACTIONS = /* @__PURE__ */ new Set(["n", "no", "deny", "reject"]);
 var ReviewManager = class {
   /**
-   * @param ctx - Koishi 上下文。
-   * @param config - 插件配置对象。
-   * @param fileManager - 文件管理器实例。
-   * @param logger - 日志记录器实例。
+   * @constructor
+   * @param ctx Koishi 上下文。
+   * @param config 插件配置。
+   * @param fileManager 文件管理器实例。
+   * @param logger 日志记录器实例。
    */
   constructor(ctx, config, fileManager, logger2) {
     this.ctx = ctx;
@@ -501,101 +421,75 @@ var ReviewManager = class {
     __name(this, "ReviewManager");
   }
   /**
-   * 注册与审核相关的 `.review` 子命令。
-   * @param cave - 主 `cave` 命令实例，用于挂载子命令。
+   * @description 注册与审核相关的 `.review` 子命令。
+   * @param cave - 主 `cave` 命令实例。
    */
   registerCommands(cave) {
     cave.subcommand(".review [id:posint] [action:string]", "审核回声洞").usage("查看或审核回声洞，使用 <Y/N> 进行审核。").action(async ({ session }, id, action) => {
-      if (!this.config.adminUsers.includes(session.userId)) {
-        return "抱歉，你没有权限执行审核";
-      }
+      if (!this.config.adminUsers.includes(session.userId)) return "抱歉，你没有权限执行审核";
       if (!id) {
-        return this.listPendingCaves();
+        const pendingCaves = await this.ctx.database.get("cave", { status: "pending" });
+        if (pendingCaves.length === 0) return "当前没有需要审核的回声洞";
+        return `当前共有 ${pendingCaves.length} 条待审核回声洞，序号为：
+${pendingCaves.map((c) => c.id).join(", ")}`;
       }
       const [targetCave] = await this.ctx.database.get("cave", { id });
       if (!targetCave) return `回声洞（${id}）不存在`;
       if (targetCave.status !== "pending") return `回声洞（${id}）无需审核`;
-      if (!action) {
-        return this.buildReviewMessage(targetCave);
+      if (id && !action) {
+        return [`待审核：`, ...await buildCaveMessage(targetCave, this.config, this.fileManager, this.logger)];
       }
       const normalizedAction = action.toLowerCase();
-      if (APPROVE_ACTIONS.has(normalizedAction)) {
-        return this.processReview("approve", targetCave, session.username);
-      }
-      if (REJECT_ACTIONS.has(normalizedAction)) {
-        return this.processReview("reject", targetCave, session.username);
-      }
-      return `无效操作: "${action}"
+      let reviewAction;
+      if (["y", "yes", "ok", "pass", "approve"].includes(normalizedAction)) reviewAction = "approve";
+      else if (["n", "no", "deny", "reject"].includes(normalizedAction)) reviewAction = "reject";
+      else return `无效操作: "${action}"
 请使用 "Y" (通过) 或 "N" (拒绝)`;
+      return this.processReview(reviewAction, id, session.username);
     });
   }
   /**
-   * 列出所有待审核的回声洞。
-   * @private
-   */
-  async listPendingCaves() {
-    const pendingCaves = await this.ctx.database.get("cave", { status: "pending" });
-    if (pendingCaves.length === 0) {
-      return "当前没有需要审核的回声洞";
-    }
-    const pendingIds = pendingCaves.map((c) => c.id).join(", ");
-    return `当前共有 ${pendingCaves.length} 条待审核回声洞，序号为：
-${pendingIds}`;
-  }
-  /**
-   * 将一条新回声洞提交给管理员进行审核。
-   * 如果没有配置管理员，将自动通过审核。
-   * @param cave - 新创建的、状态为 'pending' 的回声洞对象。
+   * @description 将新回声洞提交给管理员审核。
+   * @param cave 新创建的、状态为 'pending' 的回声洞对象。
    */
   async sendForReview(cave) {
     if (!this.config.adminUsers?.length) {
-      this.logger.warn(`No admin users configured. Cave ${cave.id} has been auto-approved.`);
+      this.logger.warn(`未配置管理员，回声洞（${cave.id}）已自动通过审核`);
       await this.ctx.database.upsert("cave", [{ id: cave.id, status: "active" }]);
       return;
     }
-    const reviewMessage = await this.buildReviewMessage(cave);
+    const reviewMessage = [`待审核：`, ...await buildCaveMessage(cave, this.config, this.fileManager, this.logger)];
     try {
       await this.ctx.broadcast(this.config.adminUsers, reviewMessage);
     } catch (error) {
-      this.logger.error(`Failed to broadcast review request for cave ${cave.id}:`, error);
+      this.logger.error(`广播回声洞（${cave.id}）审核请求失败:`, error);
     }
   }
   /**
-   * 构建用于发送给管理员的审核消息。
-   * @param cave - 待审核的回声洞对象。
-   * @returns 一个可直接发送的消息数组。
-   * @private
-   */
-  async buildReviewMessage(cave) {
-    const caveContent = await buildCaveMessage(cave, this.config, this.fileManager, this.logger);
-    return [`待审核`, ...caveContent];
-  }
-  /**
-   * 处理管理员的审核决定（通过或拒绝）。
-   * @param action - 'approve' (通过) 或 'reject' (拒绝)。
-   * @param cave - 被审核的回声洞对象。
-   * @param adminUserName - 执行操作的管理员昵称。
+   * @description 处理管理员的审核决定（通过或拒绝）。
+   * @param action 'approve' (通过) 或 'reject' (拒绝)。
+   * @param caveId 被审核的回声洞 ID。
+   * @param adminUserName 操作管理员的昵称。
    * @returns 返回给操作者的确认消息。
    */
-  async processReview(action, cave, adminUserName) {
+  async processReview(action, caveId, adminUserName) {
+    const [cave] = await this.ctx.database.get("cave", { id: caveId, status: "pending" });
+    if (!cave) return `回声洞（${caveId}）不存在或无需审核`;
     let resultMessage;
     let broadcastMessage;
     if (action === "approve") {
-      await this.ctx.database.upsert("cave", [{ id: cave.id, status: "active" }]);
-      resultMessage = `回声洞（${cave.id}）已通过`;
-      broadcastMessage = `回声洞（${cave.id}）已由管理员 "${adminUserName}" 通过`;
+      await this.ctx.database.upsert("cave", [{ id: caveId, status: "active" }]);
+      resultMessage = `回声洞（${caveId}）已通过`;
+      broadcastMessage = `回声洞（${caveId}）已由管理员 "${adminUserName}" 通过`;
     } else {
-      await this.ctx.database.upsert("cave", [{ id: cave.id, status: "delete" }]);
-      resultMessage = `回声洞（${cave.id}）已拒绝`;
-      const caveContent = await buildCaveMessage(cave, this.config, this.fileManager, this.logger);
-      broadcastMessage = [`回声洞（${cave.id}）已由管理员 "${adminUserName}" 拒绝`, ...caveContent];
-      cleanupPendingDeletions(this.ctx, this.fileManager, this.logger).catch((err) => {
-        this.logger.error(`Background cleanup failed for rejected cave ${cave.id}:`, err);
-      });
+      await this.ctx.database.upsert("cave", [{ id: caveId, status: "delete" }]);
+      resultMessage = `回声洞（${caveId}）已拒绝`;
+      broadcastMessage = `回声洞（${caveId}）已由管理员 "${adminUserName}" 拒绝`;
+      cleanupPendingDeletions(this.ctx, this.fileManager, this.logger);
     }
     if (this.config.adminUsers?.length) {
       this.ctx.broadcast(this.config.adminUsers, broadcastMessage).catch((err) => {
-        this.logger.error(`Failed to broadcast review result for cave ${cave.id}:`, err);
+        this.logger.error(`广播回声洞（${cave.id}）审核结果失败:`, err);
       });
     }
     return resultMessage;
@@ -611,7 +505,6 @@ var usage = `
   <p>📖 <strong>使用文档</strong>：请点击左上角的 <strong>插件主页</strong> 查看插件使用文档</p>
   <p>🔍 <strong>更多插件</strong>：可访问 <a href="https://github.com/YisRime" style="color:#4a6ee0;text-decoration:none;">苡淞的 GitHub</a> 查看本人的所有插件</p>
 </div>
-
 <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);">
   <h2 style="margin-top: 0; color: #e0574a;">❤️ 支持与反馈</h2>
   <p>🌟 喜欢这个插件？请在 <a href="https://github.com/YisRime" style="color:#e0574a;text-decoration:none;">GitHub</a> 上给我一个 Star！</p>
@@ -651,9 +544,7 @@ function apply(ctx, config) {
     userName: "string",
     status: "string",
     time: "timestamp"
-  }, {
-    primary: "id"
-  });
+  }, { primary: "id" });
   const fileManager = new FileManager(ctx.baseDir, config, logger);
   const lastUsed = /* @__PURE__ */ new Map();
   let profileManager;
@@ -674,64 +565,94 @@ function apply(ctx, config) {
       }
       const randomId = candidates[Math.floor(Math.random() * candidates.length)].id;
       const [randomCave] = await ctx.database.get("cave", { ...query, id: randomId });
-      if (randomCave) {
-        updateCooldownTimestamp(session, config, lastUsed);
-        return buildCaveMessage(randomCave, config, fileManager, logger);
-      }
-      return "未能获取到回声洞";
+      updateCooldownTimestamp(session, config, lastUsed);
+      return buildCaveMessage(randomCave, config, fileManager, logger);
     } catch (error) {
       logger.error("随机获取回声洞失败:", error);
+      return "随机获取回声洞失败";
     }
   });
   cave.subcommand(".add [content:text]", "添加回声洞").usage("添加一条回声洞。可以直接发送内容，也可以回复或引用一条消息。").action(async ({ session }, content) => {
     try {
-      let sourceElements = session.quote?.elements;
-      if (!sourceElements) {
-        const sourceText = content?.trim();
-        if (sourceText) {
-          sourceElements = import_koishi2.h.parse(sourceText);
-        } else {
-          await session.send("请在一分钟内发送你要添加的内容");
-          const reply = await session.prompt(6e4);
-          if (!reply) return "操作超时，已取消添加";
-          sourceElements = import_koishi2.h.parse(reply);
-        }
+      let sourceElements;
+      if (session.quote?.elements) {
+        sourceElements = session.quote.elements;
+      } else if (content?.trim()) {
+        sourceElements = import_koishi2.h.parse(content);
+      } else {
+        await session.send("请在一分钟内发送你要添加的内容");
+        const reply = await session.prompt(6e4);
+        if (!reply) return "操作超时，已取消添加";
+        sourceElements = import_koishi2.h.parse(reply);
       }
-      const scopeQuery = getScopeQuery(session, config);
-      const allCaves = await ctx.database.get("cave", scopeQuery, { fields: ["id"] });
-      const existingIds = new Set(allCaves.map((c) => c.id));
-      let newId = 1;
-      while (existingIds.has(newId)) {
-        newId++;
+      const idScopeQuery = {};
+      if (config.perChannel && session.channelId) {
+        idScopeQuery["channelId"] = session.channelId;
       }
-      const { finalElementsForDb, mediaToDownload } = prepareElementsForStorage(sourceElements, newId, session.channelId, session.userId);
-      if (finalElementsForDb.length === 0) return "内容为空，已取消添加";
-      let userName = session.username;
-      if (config.enableProfile && profileManager) {
-        userName = await profileManager.getNickname(session.userId) || userName;
+      const newId = await getNextCaveId(ctx, idScopeQuery);
+      const finalElementsForDb = [];
+      const mediaToSave = [];
+      let mediaIndex = 0;
+      const typeMap = {
+        "img": "image",
+        "image": "image",
+        "video": "video",
+        "audio": "audio",
+        "file": "file",
+        "text": "text"
+      };
+      async function traverseAndProcess(elements) {
+        for (const el of elements) {
+          const normalizedType = typeMap[el.type];
+          if (!normalizedType) {
+            if (el.children) await traverseAndProcess(el.children);
+            continue;
+          }
+          if (["image", "video", "audio", "file"].includes(normalizedType) && el.attrs.src) {
+            let fileIdentifier = el.attrs.src;
+            if (fileIdentifier.startsWith("http")) {
+              mediaIndex++;
+              const defaultExtMap = { "image": ".jpg", "video": ".mp4", "audio": ".mp3", "file": ".dat" };
+              const ext = el.attrs.file && path3.extname(el.attrs.file) ? path3.extname(el.attrs.file) : defaultExtMap[normalizedType] || ".dat";
+              const channelIdentifier = session.channelId || "private";
+              const fileName = `${newId}_${mediaIndex}_${channelIdentifier}_${session.userId}${ext}`;
+              mediaToSave.push({ sourceUrl: fileIdentifier, fileName });
+              fileIdentifier = fileName;
+            }
+            finalElementsForDb.push({ type: normalizedType, file: fileIdentifier });
+          } else if (normalizedType === "text" && el.attrs.content?.trim()) {
+            finalElementsForDb.push({ type: "text", content: el.attrs.content.trim() });
+          }
+          if (el.children) {
+            await traverseAndProcess(el.children);
+          }
+        }
       }
+      __name(traverseAndProcess, "traverseAndProcess");
+      await traverseAndProcess(sourceElements);
+      if (finalElementsForDb.length === 0) return "内容为空，已取消添加";
+      const customNickname = config.enableProfile ? await profileManager.getNickname(session.userId) : null;
       const newCave = {
         id: newId,
         elements: finalElementsForDb,
         channelId: session.channelId,
         userId: session.userId,
-        userName,
+        userName: customNickname || session.username,
         status: config.enableReview ? "pending" : "active",
         time: /* @__PURE__ */ new Date()
       };
       await ctx.database.create("cave", newCave);
       try {
-        const downloadPromises = mediaToDownload.map(async (media) => {
-          const response = await ctx.http.get(media.url, { responseType: "arraybuffer", timeout: 3e4 });
+        await Promise.all(mediaToSave.map(async (media) => {
+          const response = await ctx.http.get(media.sourceUrl, { responseType: "arraybuffer", timeout: 3e4 });
           await fileManager.saveFile(media.fileName, Buffer.from(response));
-        });
-        await Promise.all(downloadPromises);
-      } catch (fileError) {
+        }));
+      } catch (fileSaveError) {
+        logger.error(`文件保存失败:`, fileSaveError);
         await ctx.database.remove("cave", { id: newId });
-        logger.error("媒体文件存储失败:", fileError);
-        return "添加失败：媒体文件存储失败";
+        throw fileSaveError;
       }
-      if (newCave.status === "pending" && reviewManager) {
+      if (newCave.status === "pending") {
         reviewManager.sendForReview(newCave);
         return `提交成功，序号为（${newCave.id}）`;
       }
@@ -761,19 +682,15 @@ function apply(ctx, config) {
     try {
       const [targetCave] = await ctx.database.get("cave", { id, status: "active" });
       if (!targetCave) return `回声洞（${id}）不存在`;
-      const isOwner = targetCave.userId === session.userId;
-      const isAdmin = config.adminUsers.includes(session.userId);
-      if (!isOwner && !isAdmin) {
+      if (targetCave.userId !== session.userId && !config.adminUsers.includes(session.userId)) {
         return "抱歉，你没有权限删除这条回声洞";
       }
-      const caveMessage = await buildCaveMessage(targetCave, config, fileManager, logger);
       await ctx.database.upsert("cave", [{ id, status: "delete" }]);
-      session.send([`已删除`, ...caveMessage]);
-      cleanupPendingDeletions(ctx, fileManager, logger).catch((err) => {
-        logger.error(`删除回声洞（${id}）失败:`, err);
-      });
+      const caveMessage = await buildCaveMessage(targetCave, config, fileManager, logger);
+      cleanupPendingDeletions(ctx, fileManager, logger);
+      return [`已删除`, ...caveMessage];
     } catch (error) {
-      logger.error(`标记删除回声洞（${id}）失败:`, error);
+      logger.error(`标记回声洞（${id}）失败:`, error);
       return "删除失败，请稍后再试";
     }
   });