koishi-plugin-best-cave 2.7.11 → 2.7.12

package/lib/HashManager.d.ts

@@ -32,6 +32,12 @@ export declare class HashManager {
      * @param cave - 主 `cave` 命令实例。
      */
     registerCommands(cave: any): void;
+    /**
+     * @description 扫描并修复单个图片 Buffer，移除文件结束符之后的多余数据。
+     * @param imageBuffer - 原始的图片 Buffer。
+     * @returns 修复后的图片 Buffer。如果无需修复，则返回原始 Buffer。
+     */
+    sanitizeImageBuffer(imageBuffer: Buffer): Buffer;
     /**
      * @description 执行一维离散余弦变换 (DCT-II) 的方法。
      * @param input - 输入的数字数组。

package/lib/Utils.d.ts

@@ -57,7 +57,7 @@ export declare function processMessageElements(sourceElements: h[], newId: numbe
  * @description 执行文本 (Simhash) 和图片 (pHash) 相似度查重。
  * @returns 一个对象，指示是否发现重复项；如果未发现，则返回生成的哈希。
  */
-export declare function performSimilarityChecks(ctx: Context, config: Config, hashManager: HashManager, finalElementsForDb: StoredElement[], downloadedMedia: {
+export declare function performSimilarityChecks(ctx: Context, config: Config, hashManager: HashManager, logger: Logger, finalElementsForDb: StoredElement[], downloadedMedia: {
     fileName: string;
     buffer: Buffer;
 }[]): Promise<{
@@ -81,7 +81,7 @@ export declare function performSimilarityChecks(ctx: Context, config: Config, ha
 export declare function handleFileUploads(ctx: Context, config: Config, fileManager: FileManager, logger: Logger, cave: CaveObject, downloadedMedia: {
     fileName: string;
     buffer: Buffer;
-}[], reusableIds: Set<number>, session: Session): Promise<'pending' | 'active'>;
+}[], reusableIds: Set<number>, needsReview: boolean): Promise<'pending' | 'active'>;
 /**
  * @description 校验会话是否来自指定的管理群组。
  * @param session 当前会话。

package/lib/index.js

@@ -450,42 +450,46 @@ async function processMessageElements(sourceElements, newId, session, creationTi
   return { finalElementsForDb, mediaToSave };
 }
 __name(processMessageElements, "processMessageElements");
-async function performSimilarityChecks(ctx, config, hashManager, finalElementsForDb, downloadedMedia) {
-  const textHashesToStore = [];
-  const imageHashesToStore = [];
-  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) {
-      const existingTextHashes = await ctx.database.get("cave_hash", { type: "text" });
-      for (const existing of existingTextHashes) {
-        const similarity = hashManager.calculateSimilarity(newSimhash, existing.hash);
-        if (similarity >= config.textThreshold) return { duplicate: true, message: `文本与回声洞（${existing.cave}）的相似度（${similarity.toFixed(2)}%）超过阈值` };
+async function performSimilarityChecks(ctx, config, hashManager, logger2, finalElementsForDb, downloadedMedia) {
+  try {
+    const textHashesToStore = [];
+    const imageHashesToStore = [];
+    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) {
+        const existingTextHashes = await ctx.database.get("cave_hash", { type: "text" });
+        for (const existing of existingTextHashes) {
+          const similarity = hashManager.calculateSimilarity(newSimhash, existing.hash);
+          if (similarity >= config.textThreshold) return { duplicate: true, message: `文本与回声洞（${existing.cave}）的相似度（${similarity.toFixed(2)}%）超过阈值` };
+        }
+        textHashesToStore.push({ hash: newSimhash, type: "text" });
       }
-      textHashesToStore.push({ hash: newSimhash, type: "text" });
     }
-  }
-  if (downloadedMedia.length > 0) {
-    const allExistingImageHashes = await ctx.database.get("cave_hash", { type: "image" });
-    for (const media of downloadedMedia) {
-      if ([".png", ".jpg", ".jpeg", ".webp"].includes(path2.extname(media.fileName).toLowerCase())) {
-        const imageHash = await hashManager.generatePHash(media.buffer);
-        for (const existing of allExistingImageHashes) {
-          const similarity = hashManager.calculateSimilarity(imageHash, existing.hash);
-          if (similarity >= config.imageThreshold) return { duplicate: true, message: `图片与回声洞（${existing.cave}）的相似度（${similarity.toFixed(2)}%）超过阈值` };
+    if (downloadedMedia.length > 0) {
+      const allExistingImageHashes = await ctx.database.get("cave_hash", { type: "image" });
+      for (const media of downloadedMedia) {
+        if ([".png", ".jpg", ".jpeg", ".webp"].includes(path2.extname(media.fileName).toLowerCase())) {
+          const imageHash = await hashManager.generatePHash(media.buffer);
+          for (const existing of allExistingImageHashes) {
+            const similarity = hashManager.calculateSimilarity(imageHash, existing.hash);
+            if (similarity >= config.imageThreshold) return { duplicate: true, message: `图片与回声洞（${existing.cave}）的相似度（${similarity.toFixed(2)}%）超过阈值` };
+          }
+          imageHashesToStore.push({ hash: imageHash, type: "image" });
+          allExistingImageHashes.push({ cave: 0, hash: imageHash, type: "image" });
         }
-        imageHashesToStore.push({ hash: imageHash, type: "image" });
-        allExistingImageHashes.push({ cave: 0, hash: imageHash, type: "image" });
       }
     }
+    return { duplicate: false, textHashesToStore, imageHashesToStore };
+  } catch (error) {
+    logger2.warn("相似度比较失败:", error);
+    return { duplicate: false, textHashesToStore: [], imageHashesToStore: [] };
   }
-  return { duplicate: false, textHashesToStore, imageHashesToStore };
 }
 __name(performSimilarityChecks, "performSimilarityChecks");
-async function handleFileUploads(ctx, config, fileManager, logger2, cave, downloadedMedia, reusableIds, session) {
+async function handleFileUploads(ctx, config, fileManager, logger2, cave, downloadedMedia, reusableIds, needsReview) {
   try {
     await Promise.all(downloadedMedia.map((item) => fileManager.saveFile(item.fileName, item.buffer)));
-    const needsReview = config.enablePend && session.channelId !== config.adminChannel?.split(":")[1];
     const finalStatus = needsReview ? "pending" : "active";
     await ctx.database.upsert("cave", [{ id: cave.id, status: finalStatus }]);
     return finalStatus;
@@ -845,37 +849,12 @@ var HashManager = class {
         if (!cavesToProcess.length) return "无可修复的回声洞";
         let fixedFiles = 0;
         let errorCount = 0;
-        const PNG_SIGNATURE = Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]);
-        const JPEG_SIGNATURE = Buffer.from([255, 216]);
-        const GIF_SIGNATURE = Buffer.from("GIF");
         for (const cave2 of cavesToProcess) {
           const imageElements = cave2.elements.filter((el) => el.type === "image" && el.file);
           for (const element of imageElements) {
             try {
               const originalBuffer = await this.fileManager.readFile(element.file);
-              let sanitizedBuffer = originalBuffer;
-              if (originalBuffer.slice(0, 8).equals(PNG_SIGNATURE)) {
-                const IEND_CHUNK = Buffer.from("IEND");
-                const iendIndex = originalBuffer.lastIndexOf(IEND_CHUNK);
-                if (iendIndex !== -1) {
-                  const endOfPngData = iendIndex + 8;
-                  if (originalBuffer.length > endOfPngData) sanitizedBuffer = originalBuffer.slice(0, endOfPngData);
-                }
-              } else if (originalBuffer.slice(0, 2).equals(JPEG_SIGNATURE)) {
-                const EOI_MARKER = Buffer.from([255, 217]);
-                const eoiIndex = originalBuffer.lastIndexOf(EOI_MARKER);
-                if (eoiIndex !== -1) {
-                  const endOfJpegData = eoiIndex + 2;
-                  if (originalBuffer.length > endOfJpegData) sanitizedBuffer = originalBuffer.slice(0, endOfJpegData);
-                }
-              } else if (originalBuffer.slice(0, 3).equals(GIF_SIGNATURE)) {
-                const GIF_TERMINATOR = Buffer.from([59]);
-                const terminatorIndex = originalBuffer.lastIndexOf(GIF_TERMINATOR);
-                if (terminatorIndex !== -1) {
-                  const endOfGifData = terminatorIndex + 1;
-                  if (originalBuffer.length > endOfGifData) sanitizedBuffer = originalBuffer.slice(0, endOfGifData);
-                }
-              }
+              const sanitizedBuffer = this.sanitizeImageBuffer(originalBuffer);
               if (!originalBuffer.equals(sanitizedBuffer)) {
                 await this.fileManager.saveFile(element.file, sanitizedBuffer);
                 fixedFiles++;
@@ -895,6 +874,40 @@ var HashManager = class {
       }
     });
   }
+  /**
+   * @description 扫描并修复单个图片 Buffer，移除文件结束符之后的多余数据。
+   * @param imageBuffer - 原始的图片 Buffer。
+   * @returns 修复后的图片 Buffer。如果无需修复，则返回原始 Buffer。
+   */
+  sanitizeImageBuffer(imageBuffer) {
+    const PNG_SIGNATURE = Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]);
+    const JPEG_SIGNATURE = Buffer.from([255, 216]);
+    const GIF_SIGNATURE = Buffer.from("GIF");
+    let sanitizedBuffer = imageBuffer;
+    if (imageBuffer.slice(0, 8).equals(PNG_SIGNATURE)) {
+      const IEND_CHUNK = Buffer.from("IEND");
+      const iendIndex = imageBuffer.lastIndexOf(IEND_CHUNK);
+      if (iendIndex !== -1) {
+        const endOfPngData = iendIndex + 8;
+        if (imageBuffer.length > endOfPngData) sanitizedBuffer = imageBuffer.slice(0, endOfPngData);
+      }
+    } else if (imageBuffer.slice(0, 2).equals(JPEG_SIGNATURE)) {
+      const EOI_MARKER = Buffer.from([255, 217]);
+      const eoiIndex = imageBuffer.lastIndexOf(EOI_MARKER);
+      if (eoiIndex !== -1) {
+        const endOfJpegData = eoiIndex + 2;
+        if (imageBuffer.length > endOfJpegData) sanitizedBuffer = imageBuffer.slice(0, endOfJpegData);
+      }
+    } else if (imageBuffer.slice(0, 3).equals(GIF_SIGNATURE)) {
+      const GIF_TERMINATOR = Buffer.from([59]);
+      const terminatorIndex = imageBuffer.lastIndexOf(GIF_TERMINATOR);
+      if (terminatorIndex !== -1) {
+        const endOfGifData = terminatorIndex + 1;
+        if (imageBuffer.length > endOfGifData) sanitizedBuffer = imageBuffer.slice(0, endOfGifData);
+      }
+    }
+    return sanitizedBuffer;
+  }
   /**
    * @description 执行一维离散余弦变换 (DCT-II) 的方法。
    * @param input - 输入的数字数组。
@@ -1094,15 +1107,19 @@ var AIManager = class {
    * @returns {Promise<void>} 分析和存储操作完成后解析的 Promise。
    */
   async analyzeAndStore(cave, mediaBuffers) {
-    const mediaMap = mediaBuffers ? new Map(mediaBuffers.map((m) => [m.fileName, m.buffer])) : void 0;
-    const [result] = await this.getAnalyses([cave], mediaMap);
-    if (result) {
-      await this.ctx.database.upsert("cave_meta", [{
-        cave: cave.id,
-        keywords: result.keywords || [],
-        description: result.description || "",
-        rating: Math.max(0, Math.min(100, result.rating || 0))
-      }]);
+    try {
+      const mediaMap = mediaBuffers ? new Map(mediaBuffers.map((m) => [m.fileName, m.buffer])) : void 0;
+      const [result] = await this.getAnalyses([cave], mediaMap);
+      if (result) {
+        await this.ctx.database.upsert("cave_meta", [{
+          cave: cave.id,
+          keywords: result.keywords || [],
+          description: result.description || "",
+          rating: Math.max(0, Math.min(100, result.rating || 0))
+        }]);
+      }
+    } catch (error) {
+      this.logger.error(`分析回声洞（${cave.id}）出错:`, error);
     }
   }
   /**
@@ -1256,7 +1273,7 @@ var Config = import_koishi3.Schema.intersect([
     enableAI: import_koishi3.Schema.boolean().default(false).description("启用 AI"),
     aiEndpoint: import_koishi3.Schema.string().description("端点 (Endpoint)").role("link").default("https://generativelanguage.googleapis.com/v1beta/openai"),
     aiApiKey: import_koishi3.Schema.string().description("密钥 (Key)").role("secret"),
-    aiModel: import_koishi3.Schema.string().description("模型 (Model)").default("gemini-2.5-flash"),
+    aiModel: import_koishi3.Schema.string().description("模型 (Model)").default("gemini-1.5-flash"),
     aiRPM: import_koishi3.Schema.number().description("每分钟请求数 (RPM)").default(60),
     AnalysePrompt: import_koishi3.Schema.string().role("textarea").default(`你是一位内容分析专家。请分析我以JSON格式提供的一组内容（每项包含ID、文本和图片），为每一项内容总结关键词、概括内容并评分。你需要返回一个包含所有分析结果的JSON对象。`).description("分析 Prompt"),
     aiAnalyseSchema: import_koishi3.Schema.string().role("textarea").default(
@@ -1403,7 +1420,8 @@ function apply(ctx, config) {
       let textHashesToStore = [];
       let imageHashesToStore = [];
       if (hashManager) {
-        const checkResult = await performSimilarityChecks(ctx, config, hashManager, finalElementsForDb, downloadedMedia);
+        for (const media of downloadedMedia) media.buffer = hashManager.sanitizeImageBuffer(media.buffer);
+        const checkResult = await performSimilarityChecks(ctx, config, hashManager, logger, finalElementsForDb, downloadedMedia);
         if (checkResult.duplicate) return checkResult.message;
         textHashesToStore = checkResult.textHashesToStore;
         imageHashesToStore = checkResult.imageHashesToStore;
@@ -1413,7 +1431,7 @@ function apply(ctx, config) {
         if (duplicateResult && duplicateResult.duplicate) return `内容与回声洞（${duplicateResult.id}）重复`;
       }
       const userName = (config.enableName ? await profileManager.getNickname(session.userId) : null) || session.username;
-      const needsReview = config.enablePend && session.channelId !== config.adminChannel?.split(":")[1];
+      const needsReview = config.enablePend && session.cid !== config.adminChannel;
       let finalStatus = hasMedia ? "preload" : needsReview ? "pending" : "active";
       const newCave = await ctx.database.create("cave", {
         id: newId,
@@ -1424,7 +1442,7 @@ function apply(ctx, config) {
         status: finalStatus,
         time: creationTime
       });
-      if (hasMedia) finalStatus = await handleFileUploads(ctx, config, fileManager, logger, newCave, downloadedMedia, reusableIds, session);
+      if (hasMedia) finalStatus = await handleFileUploads(ctx, config, fileManager, logger, newCave, downloadedMedia, reusableIds, needsReview);
       if (finalStatus !== "preload") {
         newCave.status = finalStatus;
         if (aiManager) await aiManager.analyzeAndStore(newCave, downloadedMedia);
@@ -1458,7 +1476,7 @@ function apply(ctx, config) {
       const [targetCave] = await ctx.database.get("cave", { id, status: "active" });
       if (!targetCave) return `回声洞（${id}）不存在`;
       const isAuthor = targetCave.userId === session.userId;
-      const isAdmin = session.channelId === config.adminChannel?.split(":")[1];
+      const isAdmin = session.cid === config.adminChannel;
       if (!isAuthor && !isAdmin) return "你没有权限删除这条回声洞";
       await ctx.database.upsert("cave", [{ id, status: "delete" }]);
       const caveMessages = await buildCaveMessage(targetCave, config, fileManager, logger, session.platform, "已删除");
@@ -1471,8 +1489,8 @@ function apply(ctx, config) {
   });
   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 "此指令仅限在管理群组中使用";
+      const adminError = requireAdmin(session, config);
+      if (adminError) return adminError;
       try {
         const aggregatedStats = await ctx.database.select("cave", { status: "active" }).groupBy(["userId", "userName"], { count: /* @__PURE__ */ __name((row) => import_koishi3.$.count(row.id), "count") }).execute();
         if (!aggregatedStats.length) return "目前没有回声洞投稿";

package/package.json

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