koishi-plugin-best-cave 2.3.16 → 2.3.18

package/lib/Utils.d.ts

@@ -10,9 +10,10 @@ import { PendManager } from './PendManager';
  * @param fileManager 文件管理器实例。
  * @param logger 日志记录器实例。
  * @param platform 目标平台名称 (e.g., 'onebot')。
+ * @param prefix 可选的消息前缀 (e.g., '已删除', '待审核')。
  * @returns 包含多条消息的数组，每条消息是一个 (string | h)[] 数组。
  */
-export declare function buildCaveMessage(cave: CaveObject, config: Config, fileManager: FileManager, logger: Logger, platform?: string): Promise<(string | h)[][]>;
+export declare function buildCaveMessage(cave: CaveObject, config: Config, fileManager: FileManager, logger: Logger, platform?: string, prefix?: string): Promise<(string | h)[][]>;
 /**
  * @description 清理数据库中标记为 'delete' 状态的回声洞及其关联文件和哈希。
  * @param ctx Koishi 上下文。
@@ -62,6 +63,20 @@ export declare function processMessageElements(sourceElements: h[], newId: numbe
         fileName: string;
     }[];
 }>;
+/**
+ * @description 异步处理文件上传、查重和状态更新的后台任务。
+ * @param ctx - Koishi 上下文。
+ * @param config - 插件配置。
+ * @param fileManager - FileManager 实例，用于保存文件。
+ * @param logger - 日志记录器实例。
+ * @param reviewManager - ReviewManager 实例，用于提交审核。
+ * @param cave - 刚刚在数据库中创建的 `preload` 状态的回声洞对象。
+ * @param mediaToSave - 需要下载和处理的媒体文件列表。
+ * @param reusableIds - 可复用 ID 的内存缓存。
+ * @param session - 触发此操作的用户会话，用于发送反馈。
+ * @param hashManager - HashManager 实例，如果启用则用于哈希计算和比较。
+ * @param textHashesToStore - 已预先计算好的、待存入数据库的文本哈希对象数组。
+ */
 export declare function handleFileUploads(ctx: Context, config: Config, fileManager: FileManager, logger: Logger, reviewManager: PendManager, cave: CaveObject, mediaToToSave: {
     sourceUrl: string;
     fileName: string;

package/lib/index.js

@@ -80,9 +80,7 @@ var FileManager = class {
    * @returns 异步操作的结果。
    */
   async withLock(fullPath, operation) {
-    while (this.locks.has(fullPath)) {
-      await this.locks.get(fullPath);
-    }
+    while (this.locks.has(fullPath)) await this.locks.get(fullPath);
     const promise = operation().finally(() => {
       this.locks.delete(fullPath);
     });
@@ -232,9 +230,7 @@ var DataManager = class {
    */
   registerCommands(cave) {
     const requireAdmin = /* @__PURE__ */ __name((action) => async ({ session }) => {
-      if (session.channelId !== this.config.adminChannel?.split(":")[1]) {
-        return "此指令仅限在管理群组中使用";
-      }
+      if (session.channelId !== this.config.adminChannel?.split(":")[1]) return "此指令仅限在管理群组中使用";
       try {
         await session.send("正在处理，请稍候...");
         return await action();
@@ -267,9 +263,7 @@ var DataManager = class {
     try {
       const fileContent = await this.fileManager.readFile(fileName);
       importedCaves = JSON.parse(fileContent.toString("utf-8"));
-      if (!Array.isArray(importedCaves) || !importedCaves.length) {
-        throw new Error("导入文件格式无效或为空");
-      }
+      if (!Array.isArray(importedCaves) || !importedCaves.length) throw new Error("导入文件格式无效或为空");
     } catch (error) {
       throw new Error(`读取导入文件失败: ${error.message}`);
     }
@@ -292,7 +286,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, platform) {
+async function buildCaveMessage(cave, config, fileManager, logger2, platform, prefix) {
   async function transformToH(elements) {
     return Promise.all(elements.map(async (el) => {
       if (el.type === "text") return import_koishi.h.text(el.content);
@@ -306,7 +300,7 @@ async function buildCaveMessage(cave, config, fileManager, logger2, platform) {
             const content = await transformToH(node.elements);
             return (0, import_koishi.h)("message", {}, [author, ...content]);
           }));
-          return (0, import_koishi.h)("forward", {}, messageNodes);
+          return (0, import_koishi.h)("message", { forward: true }, messageNodes);
         } catch (error) {
           logger2.warn(`解析回声洞（${cave.id}）合并转发内容失败:`, error);
           return import_koishi.h.text("[合并转发]");
@@ -315,12 +309,8 @@ async function buildCaveMessage(cave, config, fileManager, logger2, platform) {
       if (["image", "video", "audio", "file"].includes(el.type)) {
         const fileName = el.file;
         if (!fileName) return (0, import_koishi.h)("p", {}, `[${el.type}]`);
-        if (config.enableS3 && config.publicUrl) {
-          return (0, import_koishi.h)(el.type, { ...el, src: new URL(fileName, config.publicUrl).href });
-        }
-        if (config.localPath) {
-          return (0, import_koishi.h)(el.type, { ...el, src: `file://${path2.join(config.localPath, fileName)}` });
-        }
+        if (config.enableS3 && config.publicUrl) return (0, import_koishi.h)(el.type, { ...el, src: new URL(fileName, config.publicUrl).href });
+        if (config.localPath) return (0, import_koishi.h)(el.type, { ...el, src: `file://${path2.join(config.localPath, fileName)}` });
         try {
           const data = await fileManager.readFile(fileName);
           const mimeType = mimeTypeMap[path2.extname(fileName).toLowerCase()] || "application/octet-stream";
@@ -336,10 +326,13 @@ async function buildCaveMessage(cave, config, fileManager, logger2, platform) {
   __name(transformToH, "transformToH");
   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 [rawHeader, rawFooter] = config.caveFormat.split("|", 2);
+  let header = rawHeader ? rawHeader.replace(/\{id\}|\{name\}/g, (match) => replacements[match.slice(1, -1)]).trim() : "";
+  if (prefix) header = `${prefix}${header}`;
+  const footer = rawFooter ? rawFooter.replace(/\{id\}|\{name\}/g, (match) => replacements[match.slice(1, -1)]).trim() : "";
   const problematicTypes = ["video", "audio", "file", "forward"];
   const placeholderMap = { video: "[视频]", audio: "[音频]", file: "[文件]", forward: "[合并转发]" };
-  const containsProblematic = platform === "onebot" && caveHElements.some((el) => problematicTypes.includes(el.type));
+  const containsProblematic = platform === "onebot" && caveHElements.some((el) => problematicTypes.includes(el.type) || el.type === "message" && el.attrs.forward);
   if (!containsProblematic) {
     const finalMessage = [];
     if (header) finalMessage.push(header + "\n");
@@ -350,8 +343,8 @@ async function buildCaveMessage(cave, config, fileManager, logger2, platform) {
   const initialMessageContent = [];
   const followUpMessages = [];
   for (const el of caveHElements) {
-    if (problematicTypes.includes(el.type)) {
-      initialMessageContent.push(import_koishi.h.text(placeholderMap[el.type]));
+    if (problematicTypes.includes(el.type) || el.type === "message" && el.attrs.forward) {
+      initialMessageContent.push(import_koishi.h.text(placeholderMap["forward"]));
       followUpMessages.push([el]);
     } else {
       initialMessageContent.push(el);
@@ -369,9 +362,7 @@ async function cleanupPendingDeletions(ctx, fileManager, logger2, reusableIds) {
     const cavesToDelete = await ctx.database.get("cave", { status: "delete" });
     if (!cavesToDelete.length) return;
     const idsToDelete = cavesToDelete.map((c) => c.id);
-    for (const cave of cavesToDelete) {
-      await Promise.all(cave.elements.filter((el) => el.file).map((el) => fileManager.deleteFile(el.file)));
-    }
+    for (const cave of cavesToDelete) await Promise.all(cave.elements.filter((el) => el.file).map((el) => fileManager.deleteFile(el.file)));
     reusableIds.delete(0);
     idsToDelete.forEach((id) => reusableIds.add(id));
     await ctx.database.remove("cave", { id: { $in: idsToDelete } });
@@ -404,30 +395,22 @@ async function getNextCaveId(ctx, query = {}, reusableIds) {
   const existingIds = new Set(allCaveIds);
   let newId = 1;
   while (existingIds.has(newId)) newId++;
-  if (existingIds.size === (allCaveIds.length > 0 ? Math.max(...allCaveIds) : 0)) {
-    reusableIds.add(0);
-  }
+  if (existingIds.size === (allCaveIds.length > 0 ? Math.max(...allCaveIds) : 0)) reusableIds.add(0);
   return newId;
 }
 __name(getNextCaveId, "getNextCaveId");
 function checkCooldown(session, config, lastUsed) {
   const adminChannelId = config.adminChannel?.split(":")[1];
-  if (adminChannelId && session.channelId === adminChannelId) {
-    return null;
-  }
+  if (adminChannelId && session.channelId === adminChannelId) return null;
   if (config.coolDown <= 0 || !session.channelId) return null;
   const lastTime = lastUsed.get(session.channelId) || 0;
   const remainingTime = lastTime + config.coolDown * 1e3 - Date.now();
-  if (remainingTime > 0) {
-    return `指令冷却中，请在 ${Math.ceil(remainingTime / 1e3)} 秒后重试`;
-  }
+  if (remainingTime > 0) return `指令冷却中，请在 ${Math.ceil(remainingTime / 1e3)} 秒后重试`;
   return null;
 }
 __name(checkCooldown, "checkCooldown");
 function updateCooldownTimestamp(session, config, lastUsed) {
-  if (config.coolDown > 0 && session.channelId) {
-    lastUsed.set(session.channelId, Date.now());
-  }
+  if (config.coolDown > 0 && session.channelId) lastUsed.set(session.channelId, Date.now());
 }
 __name(updateCooldownTimestamp, "updateCooldownTimestamp");
 async function processMessageElements(sourceElements, newId, session, config, logger2) {
@@ -473,13 +456,9 @@ async function processMessageElements(sourceElements, newId, session, config, lo
             return (0, import_koishi.h)(type2, attrs);
           });
           const contentElements = await transform(elementsToProcess);
-          if (contentElements.length > 0) {
-            forwardNodes.push({ userId, userName, elements: contentElements });
-          }
-        }
-        if (forwardNodes.length > 0) {
-          result.push({ type: "forward", content: forwardNodes });
+          if (contentElements.length > 0) forwardNodes.push({ userId, userName, elements: contentElements });
         }
+        if (forwardNodes.length > 0) result.push({ type: "forward", content: forwardNodes });
       } else if (["image", "video", "audio", "file"].includes(type) && el.attrs.src) {
         let fileIdentifier = el.attrs.src;
         if (fileIdentifier.startsWith("http")) {
@@ -531,9 +510,7 @@ async function handleFileUploads(ctx, config, fileManager, logger2, reviewManage
     await ctx.database.upsert("cave", [{ id: cave.id, status: finalStatus }]);
     if (hashManager) {
       const allHashesToInsert = [...textHashesToStore, ...imageHashesToStore].map((h4) => ({ ...h4, cave: cave.id }));
-      if (allHashesToInsert.length > 0) {
-        await ctx.database.upsert("cave_hash", allHashesToInsert);
-      }
+      if (allHashesToInsert.length > 0) await ctx.database.upsert("cave_hash", allHashesToInsert);
     }
     if (finalStatus === "pending" && reviewManager) {
       const [finalCave] = await ctx.database.get("cave", { id: cave.id });
@@ -572,9 +549,7 @@ var PendManager = class {
    */
   registerCommands(cave) {
     const requireAdmin = /* @__PURE__ */ __name((session) => {
-      if (session.channelId !== this.config.adminChannel?.split(":")[1]) {
-        return "此指令仅限在管理群组中使用";
-      }
+      if (session.channelId !== this.config.adminChannel?.split(":")[1]) return "此指令仅限在管理群组中使用";
       return null;
     }, "requireAdmin");
     const pend = cave.subcommand(".pend [id:posint]", "审核回声洞").action(async ({ session }, id) => {
@@ -584,11 +559,8 @@ var PendManager = class {
         const [targetCave] = await this.ctx.database.get("cave", { id });
         if (!targetCave) return `回声洞（${id}）不存在`;
         if (targetCave.status !== "pending") return `回声洞（${id}）无需审核`;
-        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));
-        }
+        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"] });
@@ -634,11 +606,8 @@ ${pendingCaves.map((c) => c.id).join("|")}`;
     }
     try {
       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));
-      }
+      const caveMessages = await buildCaveMessage(cave, this.config, this.fileManager, this.logger, platform, "待审核");
+      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);
     }
@@ -679,9 +648,7 @@ var HashManager = class {
   registerCommands(cave) {
     const adminCheck = /* @__PURE__ */ __name(({ session }) => {
       const adminChannelId = this.config.adminChannel?.split(":")[1];
-      if (session.channelId !== adminChannelId) {
-        return "此指令仅限在管理群组中使用";
-      }
+      if (session.channelId !== adminChannelId) return "此指令仅限在管理群组中使用";
     }, "adminCheck");
     cave.subcommand(".hash", "校验回声洞").usage("校验缺失哈希的回声洞，补全哈希记录。").action(async (argv) => {
       const checkResult = adminCheck(argv);
@@ -738,9 +705,7 @@ var HashManager = class {
             existingHashSet.add(uniqueKey);
           }
         }
-        if (hashesToInsert.length >= 100) {
-          await flushBatch();
-        }
+        if (hashesToInsert.length >= 100) await flushBatch();
       } catch (error) {
         errorCount++;
         this.logger.warn(`补全回声洞（${cave.id}）哈希时发生错误: ${error.message}`);
@@ -823,17 +788,13 @@ var HashManager = class {
         const text2 = textHashes.get(id2);
         if (text1 && text2) {
           const similarity = this.calculateSimilarity(text1, text2);
-          if (similarity >= textThreshold) {
-            similarPairs.text.add(`${pair} = ${similarity.toFixed(2)}%`);
-          }
+          if (similarity >= textThreshold) similarPairs.text.add(`${pair} = ${similarity.toFixed(2)}%`);
         }
         const global1 = globalHashes.get(id1);
         const global2 = globalHashes.get(id2);
         if (global1 && global2) {
           const similarity = this.calculateSimilarity(global1, global2);
-          if (similarity >= imageThreshold) {
-            similarPairs.global.add(`${pair} = ${similarity.toFixed(2)}%`);
-          }
+          if (similarity >= imageThreshold) similarPairs.global.add(`${pair} = ${similarity.toFixed(2)}%`);
         }
       }
     }
@@ -862,9 +823,7 @@ var HashManager = class {
       components.get(root).add(id);
     }
     const partialGroups = [];
-    for (const component of components.values()) {
-      if (component.size > 1) partialGroups.push(Array.from(component).sort((a, b) => a - b).join(" & "));
-    }
+    for (const component of components.values()) if (component.size > 1) partialGroups.push(Array.from(component).sort((a, b) => a - b).join(" & "));
     const totalFindings = similarPairs.text.size + similarPairs.global.size + partialGroups.length;
     if (totalFindings === 0) return "未发现高相似度的内容";
     let report = `已发现 ${totalFindings} 组高相似度的内容:`;
@@ -913,9 +872,7 @@ var HashManager = class {
       const scale = Math.sqrt(2 / N);
       for (let k = 0; k < N; k++) {
         let sum = 0;
-        for (let n = 0; n < N; n++) {
-          sum += input[n] * cosines[n][k];
-        }
+        for (let n = 0; n < N; n++) sum += input[n] * cosines[n][k];
         output[k] = scale * sum;
       }
       output[0] /= Math.sqrt(2);
@@ -938,16 +895,10 @@ var HashManager = class {
     if (!Number.isInteger(hashGridSize)) throw new Error("哈希位数必须是完全平方数");
     const pixels = await (0, import_sharp.default)(imageBuffer).grayscale().resize(dctSize, dctSize, { fit: "fill" }).raw().toBuffer();
     const matrix = [];
-    for (let y = 0; y < dctSize; y++) {
-      matrix.push(Array.from(pixels.slice(y * dctSize, (y + 1) * dctSize)));
-    }
+    for (let y = 0; y < dctSize; y++) matrix.push(Array.from(pixels.slice(y * dctSize, (y + 1) * dctSize)));
     const dctMatrix = this._dct2D(matrix);
     const coefficients = [];
-    for (let y = 0; y < hashGridSize; y++) {
-      for (let x = 0; x < hashGridSize; x++) {
-        coefficients.push(dctMatrix[y][x]);
-      }
-    }
+    for (let y = 0; y < hashGridSize; y++) for (let x = 0; x < hashGridSize; x++) coefficients.push(dctMatrix[y][x]);
     const median = [...coefficients.slice(1)].sort((a, b) => a - b)[Math.floor((coefficients.length - 1) / 2)];
     const binaryHash = coefficients.map((val) => val > median ? "1" : "0").join("");
     return BigInt("0b" + binaryHash).toString(16).padStart(size / 4, "0");
@@ -963,9 +914,7 @@ var HashManager = class {
     const bin1 = hexToBinary(hex1);
     const bin2 = hexToBinary(hex2);
     const len = Math.min(bin1.length, bin2.length);
-    for (let i = 0; i < len; i++) {
-      if (bin1[i] !== bin2[i]) distance++;
-    }
+    for (let i = 0; i < len; i++) if (bin1[i] !== bin2[i]) distance++;
     return distance;
   }
   /**
@@ -992,18 +941,14 @@ var HashManager = class {
     if (cleanText.length < n) {
       tokens.add(cleanText);
     } else {
-      for (let i = 0; i <= cleanText.length - n; i++) {
-        tokens.add(cleanText.substring(i, i + n));
-      }
+      for (let i = 0; i <= cleanText.length - n; i++) tokens.add(cleanText.substring(i, i + n));
     }
     const tokenArray = Array.from(tokens);
     if (tokenArray.length === 0) return "";
     const vector = new Array(64).fill(0);
     tokenArray.forEach((token) => {
       const hash = crypto.createHash("md5").update(token).digest();
-      for (let i = 0; i < 64; i++) {
-        vector[i] += hash[Math.floor(i / 8)] >> i % 8 & 1 ? 1 : -1;
-      }
+      for (let i = 0; i < 64; i++) vector[i] += hash[Math.floor(i / 8)] >> i % 8 & 1 ? 1 : -1;
     });
     const binaryHash = vector.map((v) => v > 0 ? "1" : "0").join("");
     return BigInt("0b" + binaryHash).toString(16).padStart(16, "0");
@@ -1011,9 +956,7 @@ var HashManager = class {
 };
 function hexToBinary(hex) {
   let bin = "";
-  for (const char of hex) {
-    bin += parseInt(char, 16).toString(2).padStart(4, "0");
-  }
+  for (const char of hex) bin += parseInt(char, 16).toString(2).padStart(4, "0");
   return bin;
 }
 __name(hexToBinary, "hexToBinary");
@@ -1090,16 +1033,12 @@ function apply(ctx, config) {
     try {
       const query = getScopeQuery(session, config);
       const candidates = await ctx.database.get("cave", query, { fields: ["id"] });
-      if (!candidates.length) {
-        return `当前${config.perChannel && session.channelId ? "本群" : ""}还没有任何回声洞`;
-      }
+      if (!candidates.length) return `当前${config.perChannel && session.channelId ? "本群" : ""}还没有任何回声洞`;
       const randomId = candidates[Math.floor(Math.random() * candidates.length)].id;
       const [randomCave] = await ctx.database.get("cave", { ...query, id: randomId });
       updateCooldownTimestamp(session, config, lastUsed);
       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));
-      }
+      for (const message of messages) if (message.length > 0) await session.send(import_koishi3.h.normalize(message));
     } catch (error) {
       logger.error("随机获取回声洞失败:", error);
       return "随机获取回声洞失败";
@@ -1126,10 +1065,8 @@ ${JSON.stringify(session, null, 2)}`);
       }
       const newId = await getNextCaveId(ctx, getScopeQuery(session, config, false), reusableIds);
       const { finalElementsForDb, mediaToSave } = await processMessageElements(sourceElements, newId, session, config, logger);
-      if (config.debug) {
-        logger.info(`数据库元素: 
+      if (config.debug) logger.info(`数据库元素: 
 ${JSON.stringify(finalElementsForDb, null, 2)}`);
-      }
       if (finalElementsForDb.length === 0) return "无可添加内容";
       const textHashesToStore = [];
       if (hashManager) {
@@ -1140,9 +1077,7 @@ ${JSON.stringify(finalElementsForDb, null, 2)}`);
             const existingTextHashes = await ctx.database.get("cave_hash", { type: "simhash" });
             for (const existing of existingTextHashes) {
               const similarity = hashManager.calculateSimilarity(newSimhash, existing.hash);
-              if (similarity >= config.textThreshold) {
-                return `文本与回声洞（${existing.cave}）的相似度（${similarity.toFixed(2)}%）超过阈值`;
-              }
+              if (similarity >= config.textThreshold) return `文本与回声洞（${existing.cave}）的相似度（${similarity.toFixed(2)}%）超过阈值`;
             }
             textHashesToStore.push({ hash: newSimhash, type: "simhash" });
           }
@@ -1163,12 +1098,8 @@ ${JSON.stringify(finalElementsForDb, null, 2)}`);
       if (hasMedia) {
         handleFileUploads(ctx, config, fileManager, logger, reviewManager, newCave, mediaToSave, reusableIds, session, hashManager, textHashesToStore);
       } else {
-        if (hashManager && textHashesToStore.length > 0) {
-          await ctx.database.upsert("cave_hash", textHashesToStore.map((h4) => ({ ...h4, cave: newCave.id })));
-        }
-        if (initialStatus === "pending") {
-          reviewManager.sendForPend(newCave);
-        }
+        if (hashManager && textHashesToStore.length > 0) await ctx.database.upsert("cave_hash", textHashesToStore.map((h4) => ({ ...h4, cave: newCave.id })));
+        if (initialStatus === "pending") reviewManager.sendForPend(newCave);
       }
       return initialStatus === "pending" || initialStatus === "preload" && config.enablePend ? `提交成功，序号为（${newCave.id}）` : `添加成功，序号为（${newCave.id}）`;
     } catch (error) {
@@ -1185,9 +1116,7 @@ ${JSON.stringify(finalElementsForDb, null, 2)}`);
       if (!targetCave) return `回声洞（${id}）不存在`;
       updateCooldownTimestamp(session, config, lastUsed);
       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));
-      }
+      for (const message of messages) if (message.length > 0) await session.send(import_koishi3.h.normalize(message));
     } catch (error) {
       logger.error(`查看回声洞（${id}）失败:`, error);
       return "查看失败，请稍后再试";
@@ -1202,12 +1131,9 @@ ${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 caveMessages = await buildCaveMessage(targetCave, config, fileManager, logger, session.platform);
+      const caveMessages = await buildCaveMessage(targetCave, config, fileManager, logger, session.platform, "已删除");
       cleanupPendingDeletions(ctx, fileManager, logger, reusableIds);
-      await session.send("已删除");
-      for (const message of caveMessages) {
-        if (message.length > 0) await session.send(import_koishi3.h.normalize(message));
-      }
+      for (const message of caveMessages) if (message.length > 0) await session.send(import_koishi3.h.normalize(message));
     } catch (error) {
       logger.error(`标记回声洞（${id}）失败:`, error);
       return "删除失败，请稍后再试";
@@ -1216,9 +1142,7 @@ ${JSON.stringify(finalElementsForDb, null, 2)}`);
   cave.subcommand(".list", "查询投稿统计").option("user", "-u <user:user> 指定用户").option("all", "-a 查看排行").action(async ({ session, options }) => {
     if (options.all) {
       const adminChannelId = config.adminChannel?.split(":")[1];
-      if (session.channelId !== adminChannelId) {
-        return "此指令仅限在管理群组中使用";
-      }
+      if (session.channelId !== adminChannelId) return "此指令仅限在管理群组中使用";
       try {
         const allCaves = await ctx.database.get("cave", { status: "active" });
         if (!allCaves.length) return "目前没有任何回声洞投稿。";

package/package.json

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