koishi-plugin-best-cave 2.2.4 → 2.2.6

package/lib/HashManager.d.ts

@@ -63,7 +63,13 @@ export declare class HashManager {
      * @returns {Promise<string>} 一个包含操作结果的报告字符串。
      */
     checkForSimilarCaves(): Promise<string>;
-    private _generateSingleChannelPHash;
+    /**
+     * @description 从单通道原始像素数据计算pHash。
+     * @param channelData - 单通道的像素值数组。
+     * @param size - 图像的边长（例如16）。
+     * @returns {string} 该通道的二进制哈希字符串。
+     */
+    private _calculateHashFromRawChannel;
     /**
      * @description 生成768位颜色感知哈希（Color pHash）。
      * @param imageBuffer - 图片的 Buffer 数据。

package/lib/index.js

@@ -697,7 +697,9 @@ var HashManager = class {
     const combinedText = cave.elements.filter((el) => el.type === "text" && el.content).map((el) => el.content).join(" ");
     if (combinedText) {
       const textHash = this.generateTextSimhash(combinedText);
-      allHashes.push({ cave: cave.id, hash: textHash, type: "simhash" });
+      if (textHash) {
+        allHashes.push({ cave: cave.id, hash: textHash, type: "simhash" });
+      }
     }
     for (const el of cave.elements.filter((el2) => el2.type === "image" && el2.file)) {
       try {
@@ -806,11 +808,16 @@ var HashManager = class {
     if (subHashDuplicates.length > 0) report += "\n图片局部重复:\n" + [...new Set(subHashDuplicates)].join("\n");
     return report.trim();
   }
-  async _generateSingleChannelPHash(channelBuffer, size) {
-    const pixelData = await (0, import_sharp.default)(channelBuffer).resize(size, size, { fit: "fill" }).raw().toBuffer();
-    const totalLuminance = pixelData.reduce((acc, val) => acc + val, 0);
+  /**
+   * @description 从单通道原始像素数据计算pHash。
+   * @param channelData - 单通道的像素值数组。
+   * @param size - 图像的边长（例如16）。
+   * @returns {string} 该通道的二进制哈希字符串。
+   */
+  _calculateHashFromRawChannel(channelData, size) {
+    const totalLuminance = channelData.reduce((acc, val) => acc + val, 0);
     const avgLuminance = totalLuminance / (size * size);
-    return Array.from(pixelData).map((lum) => lum > avgLuminance ? "1" : "0").join("");
+    return channelData.map((lum) => lum > avgLuminance ? "1" : "0").join("");
   }
   /**
    * @description 生成768位颜色感知哈希（Color pHash）。
@@ -826,11 +833,9 @@ var HashManager = class {
       g.push(data[i + 1]);
       b.push(data[i + 2]);
     }
-    const [rHash, gHash, bHash] = await Promise.all([
-      this._generateSingleChannelPHash(Buffer.from(r), 16),
-      this._generateSingleChannelPHash(Buffer.from(g), 16),
-      this._generateSingleChannelPHash(Buffer.from(b), 16)
-    ]);
+    const rHash = this._calculateHashFromRawChannel(r, 16);
+    const gHash = this._calculateHashFromRawChannel(g, 16);
+    const bHash = this._calculateHashFromRawChannel(b, 16);
     const combinedHash = rHash + gHash + bHash;
     let hex = "";
     for (let i = 0; i < combinedHash.length; i += 4) {
@@ -1037,14 +1042,16 @@ function apply(ctx, config) {
         const combinedText = finalElementsForDb.filter((el) => el.type === "text" && el.content).map((el) => el.content).join(" ");
         if (combinedText) {
           const newSimhash = hashManager.generateTextSimhash(combinedText);
-          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 * 100).toFixed(2)}%，超过阈值`;
+          if (newSimhash) {
+            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 * 100).toFixed(2)}%，超过阈值`;
+              }
             }
+            textHashesToStore.push({ hash: newSimhash, type: "simhash" });
           }
-          textHashesToStore.push({ hash: newSimhash, type: "simhash" });
         }
       }
       const userName = (config.enableProfile ? await profileManager.getNickname(session.userId) : null) || session.username;

package/package.json

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