koishi-plugin-best-cave 2.5.4 → 2.6.0

package/lib/HashManager.d.ts

@@ -7,7 +7,7 @@ import { FileManager } from './FileManager';
 export interface CaveHashObject {
     cave: number;
     hash: string;
-    type: 'simhash' | 'phash_g' | 'phash_q1' | 'phash_q2' | 'phash_q3' | 'phash_q4';
+    type: 'simhash' | 'phash';
 }
 /**
  * @class HashManager
@@ -52,20 +52,6 @@ export declare class HashManager {
         textThreshold?: number;
         imageThreshold?: number;
     }): Promise<string>;
-    /**
-     * @description 为单个图片Buffer生成全局pHash和四个象限的局部pHash。
-     * @param imageBuffer - 图片的Buffer数据。
-     * @returns 包含全局哈希和四象限哈希的对象。
-     */
-    generateAllImageHashes(imageBuffer: Buffer): Promise<{
-        globalHash: string;
-        quadrantHashes: {
-            q1: string;
-            q2: string;
-            q3: string;
-            q4: string;
-        };
-    }>;
     /**
      * @description 执行二维离散余弦变换 (DCT-II)。
      * @param matrix - 输入的 N x N 像素亮度矩阵。
@@ -78,7 +64,7 @@ export declare class HashManager {
      * @param size - 期望的哈希位数 (必须是完全平方数, 如 64 或 256)。
      * @returns 十六进制pHash字符串。
      */
-    private _generatePHash;
+    generatePHash(imageBuffer: Buffer, size: number): Promise<string>;
     /**
      * @description 计算两个十六进制哈希字符串之间的汉明距离 (不同位的数量)。
      * @param hex1 - 第一个哈希。

package/lib/index.d.ts

@@ -15,7 +15,7 @@ export interface ForwardNode {
  * @description 存储在数据库中的单个消息元素。
  */
 export interface StoredElement {
-    type: 'text' | 'image' | 'video' | 'audio' | 'file' | 'at' | 'forward' | 'reply';
+    type: 'text' | 'image' | 'video' | 'audio' | 'file' | 'at' | 'forward' | 'reply' | 'face';
     content?: string | ForwardNode[];
     file?: string;
 }

package/lib/index.js

@@ -239,8 +239,8 @@ var DataManager = class {
         return `操作失败: ${error.message}`;
       }
     }, "requireAdmin");
-    cave.subcommand(".export", "导出回声洞数据").usage("将所有回声洞数据导出到 cave_export.json 中。").action(requireAdmin(() => this.exportData()));
-    cave.subcommand(".import", "导入回声洞数据").usage("从 cave_import.json 中导入回声洞数据。").action(requireAdmin(() => this.importData()));
+    cave.subcommand(".export", "导出回声洞数据", { hidden: true, authority: 4 }).usage("将所有回声洞数据导出到 cave_export.json 中。").action(requireAdmin(() => this.exportData()));
+    cave.subcommand(".import", "导入回声洞数据", { hidden: true, authority: 4 }).usage("从 cave_import.json 中导入回声洞数据。").action(requireAdmin(() => this.importData()));
   }
   /**
    * @description 导出所有 'active' 状态的回声洞数据到 `cave_export.json`。
@@ -292,6 +292,7 @@ async function buildCaveMessage(cave, config, fileManager, logger2, platform, pr
       if (el.type === "text") return import_koishi.h.text(el.content);
       if (el.type === "at") return (0, import_koishi.h)("at", { id: el.content });
       if (el.type === "reply") return (0, import_koishi.h)("reply", { id: el.content });
+      if (el.type === "face") return (0, import_koishi.h)("face", { id: el.content });
       if (el.type === "forward") {
         try {
           const forwardNodes = Array.isArray(el.content) ? el.content : [];
@@ -345,24 +346,24 @@ async function buildCaveMessage(cave, config, fileManager, logger2, platform, pr
     time: cave.time.toLocaleString()
   };
   const placeholderRegex = /\{([^}]+)\}/g;
-  const replacer = /* @__PURE__ */ __name((match, content) => {
-    const parts = content.split(":");
-    if (parts.length === 1) return data[content] ?? match;
-    if (parts.length === 4) {
-      const [maxStarsStr, key, prefixStr, suffixStr] = parts;
-      const originalValue = data[key];
-      if (!originalValue) return "";
-      const maxStars = parseInt(maxStarsStr, 10);
-      const prefixLength = parseInt(prefixStr, 10);
-      const suffixLength = parseInt(suffixStr, 10);
-      if (isNaN(maxStars) || isNaN(prefixLength) || isNaN(suffixLength)) return match;
-      if (prefixLength + suffixLength >= originalValue.length) return originalValue;
-      const prefix2 = originalValue.substring(0, prefixLength);
-      const suffix = originalValue.substring(originalValue.length - suffixLength);
-      const maskedLength = Math.min(maxStars, originalValue.length - prefixLength - suffixLength);
-      return `${prefix2}${"*".repeat(maskedLength)}${suffix}`;
-    }
-    return match;
+  const replacer = /* @__PURE__ */ __name((match, rawContent) => {
+    const isReviewMode = !!prefix;
+    const [normalPart, reviewPart] = rawContent.split("/", 2);
+    const contentToProcess = isReviewMode ? reviewPart !== void 0 ? reviewPart : normalPart : normalPart;
+    if (!contentToProcess?.trim()) return "";
+    const useMask = contentToProcess.startsWith("*");
+    const key = (useMask ? contentToProcess.substring(1) : contentToProcess).trim();
+    if (!key) return "";
+    const originalValue = data[key];
+    if (originalValue === void 0 || originalValue === null) return match;
+    const valueStr = String(originalValue);
+    if (!useMask) return valueStr;
+    const len = valueStr.length;
+    if (len <= 5) return valueStr;
+    let keep = 0;
+    if (len <= 7) keep = 2;
+    else keep = 3;
+    return `${valueStr.substring(0, keep)}***${valueStr.substring(len - keep)}`;
   }, "replacer");
   const [rawHeader, rawFooter] = config.caveFormat.split("|", 2);
   let header = rawHeader ? rawHeader.replace(placeholderRegex, replacer).trim() : "";
@@ -441,7 +442,7 @@ __name(getNextCaveId, "getNextCaveId");
 async function processMessageElements(sourceElements, newId, session, config, logger2) {
   const mediaToSave = [];
   let mediaIndex = 0;
-  const typeMap = { "img": "image", "image": "image", "video": "video", "audio": "audio", "file": "file", "text": "text", "at": "at", "forward": "forward", "reply": "reply" };
+  const typeMap = { "img": "image", "image": "image", "video": "video", "audio": "audio", "file": "file", "text": "text", "at": "at", "forward": "forward", "reply": "reply", "face": "face" };
   const defaultExtMap = { "image": ".jpg", "video": ".mp4", "audio": ".mp3", "file": ".dat" };
   async function transform(elements) {
     const result = [];
@@ -513,6 +514,8 @@ async function processMessageElements(sourceElements, newId, session, config, lo
           fileIdentifier = fileName;
         }
         result.push({ type, file: fileIdentifier });
+      } else if (type === "face" && el.attrs.id) {
+        result.push({ type: "face", content: el.attrs.id });
       }
     }
     return result;
@@ -526,15 +529,14 @@ async function handleFileUploads(ctx, config, fileManager, logger2, reviewManage
   try {
     const downloadedMedia = [];
     const imageHashesToStore = [];
-    const allExistingImageHashes = hashManager ? await ctx.database.get("cave_hash", { type: { $ne: "simhash" } }) : [];
-    const existingGlobalHashes = allExistingImageHashes.filter((h4) => h4.type === "phash_g");
+    const allExistingImageHashes = hashManager ? await ctx.database.get("cave_hash", { type: "phash" }) : [];
     for (const media of mediaToToSave) {
       const buffer = Buffer.from(await ctx.http.get(media.sourceUrl, { responseType: "arraybuffer", timeout: 3e4 }));
       downloadedMedia.push({ fileName: media.fileName, buffer });
       if (hashManager && [".png", ".jpg", ".jpeg", ".webp"].includes(path2.extname(media.fileName).toLowerCase())) {
-        const { globalHash, quadrantHashes } = await hashManager.generateAllImageHashes(buffer);
-        for (const existing of existingGlobalHashes) {
-          const similarity = hashManager.calculateSimilarity(globalHash, existing.hash);
+        const imageHash = await hashManager.generatePHash(buffer, 256);
+        for (const existing of allExistingImageHashes) {
+          const similarity = hashManager.calculateSimilarity(imageHash, existing.hash);
           if (similarity >= config.imageThreshold) {
             await session.send(`图片与回声洞（${existing.cave}）的相似度（${similarity.toFixed(2)}%）超过阈值`);
             await ctx.database.upsert("cave", [{ id: cave.id, status: "delete" }]);
@@ -542,11 +544,7 @@ async function handleFileUploads(ctx, config, fileManager, logger2, reviewManage
             return;
           }
         }
-        imageHashesToStore.push({ hash: globalHash, type: "phash_g" });
-        imageHashesToStore.push({ hash: quadrantHashes.q1, type: "phash_q1" });
-        imageHashesToStore.push({ hash: quadrantHashes.q2, type: "phash_q2" });
-        imageHashesToStore.push({ hash: quadrantHashes.q3, type: "phash_q3" });
-        imageHashesToStore.push({ hash: quadrantHashes.q4, type: "phash_q4" });
+        imageHashesToStore.push({ hash: imageHash, type: "phash" });
       }
     }
     await Promise.all(downloadedMedia.map((item) => fileManager.saveFile(item.fileName, item.buffer)));
@@ -597,7 +595,7 @@ var PendManager = class {
       if (session.channelId !== this.config.adminChannel?.split(":")[1]) return "此指令仅限在管理群组中使用";
       return null;
     }, "requireAdmin");
-    const pend = cave.subcommand(".pend [id:posint]", "审核回声洞").usage("查询待审核的回声洞列表，或指定 ID 查看对应待审核的回声洞。").action(async ({ session }, id) => {
+    const pend = cave.subcommand(".pend [id:posint]", "审核回声洞", { hidden: true }).usage("查询待审核的回声洞列表，或指定 ID 查看对应待审核的回声洞。").action(async ({ session }, id) => {
       const adminError = requireAdmin(session);
       if (adminError) return adminError;
       if (id) {
@@ -699,7 +697,7 @@ var HashManager = class {
       const adminChannelId = this.config.adminChannel?.split(":")[1];
       if (session.channelId !== adminChannelId) return "此指令仅限在管理群组中使用";
     }, "adminCheck");
-    cave.subcommand(".hash", "校验回声洞").usage("校验缺失哈希的回声洞，补全哈希记录。").action(async (argv) => {
+    cave.subcommand(".hash", "校验回声洞", { hidden: true, authority: 3 }).usage("校验缺失哈希的回声洞，补全哈希记录。").action(async (argv) => {
       const checkResult = adminCheck(argv);
       if (checkResult) return checkResult;
       await argv.session.send("正在处理，请稍候...");
@@ -710,7 +708,7 @@ var HashManager = class {
         return `操作失败: ${error.message}`;
       }
     });
-    cave.subcommand(".check", "检查相似度").usage("检查所有回声洞，找出相似度过高的内容。").option("textThreshold", "-t <threshold:number> 文本相似度阈值 (%)").option("imageThreshold", "-i <threshold:number> 图片相似度阈值 (%)").action(async (argv) => {
+    cave.subcommand(".check", "检查相似度", { hidden: true }).usage("检查所有回声洞，找出相似度过高的内容。").option("textThreshold", "-t <threshold:number> 文本相似度阈值 (%)").option("imageThreshold", "-i <threshold:number> 图片相似度阈值 (%)").action(async (argv) => {
       const checkResult = adminCheck(argv);
       if (checkResult) return checkResult;
       await argv.session.send("正在检查，请稍候...");
@@ -786,12 +784,8 @@ var HashManager = class {
     for (const el of cave.elements.filter((el2) => el2.type === "image" && el2.file)) {
       try {
         const imageBuffer = await this.fileManager.readFile(el.file);
-        const { globalHash, quadrantHashes } = await this.generateAllImageHashes(imageBuffer);
-        addUniqueHash({ cave: cave.id, hash: globalHash, type: "phash_g" });
-        addUniqueHash({ cave: cave.id, hash: quadrantHashes.q1, type: "phash_q1" });
-        addUniqueHash({ cave: cave.id, hash: quadrantHashes.q2, type: "phash_q2" });
-        addUniqueHash({ cave: cave.id, hash: quadrantHashes.q3, type: "phash_q3" });
-        addUniqueHash({ cave: cave.id, hash: quadrantHashes.q4, type: "phash_q4" });
+        const imageHash = await this.generatePHash(imageBuffer, 256);
+        addUniqueHash({ cave: cave.id, hash: imageHash, type: "phash" });
       } catch (e) {
         this.logger.warn(`无法为回声洞（${cave.id}）的图片（${el.file}）生成哈希:`, e);
       }
@@ -809,24 +803,17 @@ var HashManager = class {
     const allHashes = await this.ctx.database.get("cave_hash", {});
     const allCaveIds = [...new Set(allHashes.map((h4) => h4.cave))];
     const textHashes = /* @__PURE__ */ new Map();
-    const globalHashes = /* @__PURE__ */ new Map();
-    const quadrantHashesByCave = /* @__PURE__ */ new Map();
-    const partialHashToCaves = /* @__PURE__ */ new Map();
+    const imageHashes = /* @__PURE__ */ new Map();
     for (const hash of allHashes) {
       if (hash.type === "simhash") {
         textHashes.set(hash.cave, hash.hash);
-      } else if (hash.type === "phash_g") {
-        globalHashes.set(hash.cave, hash.hash);
-      } else if (hash.type.startsWith("phash_q")) {
-        if (!quadrantHashesByCave.has(hash.cave)) quadrantHashesByCave.set(hash.cave, /* @__PURE__ */ new Set());
-        quadrantHashesByCave.get(hash.cave).add(hash.hash);
-        if (!partialHashToCaves.has(hash.hash)) partialHashToCaves.set(hash.hash, /* @__PURE__ */ new Set());
-        partialHashToCaves.get(hash.hash).add(hash.cave);
+      } else if (hash.type === "phash") {
+        imageHashes.set(hash.cave, hash.hash);
       }
     }
     const similarPairs = {
       text: /* @__PURE__ */ new Set(),
-      global: /* @__PURE__ */ new Set()
+      image: /* @__PURE__ */ new Set()
     };
     for (let i = 0; i < allCaveIds.length; i++) {
       for (let j = i + 1; j < allCaveIds.length; j++) {
@@ -839,71 +826,21 @@ var HashManager = class {
           const similarity = this.calculateSimilarity(text1, text2);
           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)}%`);
+        const image1 = imageHashes.get(id1);
+        const image2 = imageHashes.get(id2);
+        if (image1 && image2) {
+          const similarity = this.calculateSimilarity(image1, image2);
+          if (similarity >= imageThreshold) similarPairs.image.add(`${pair} = ${similarity.toFixed(2)}%`);
         }
       }
     }
-    const allPartialCaveIds = Array.from(quadrantHashesByCave.keys());
-    const parent = /* @__PURE__ */ new Map();
-    const find = /* @__PURE__ */ __name((i) => {
-      if (parent.get(i) === i) return i;
-      parent.set(i, find(parent.get(i)));
-      return parent.get(i);
-    }, "find");
-    const union = /* @__PURE__ */ __name((i, j) => {
-      const rootI = find(i);
-      const rootJ = find(j);
-      if (rootI !== rootJ) parent.set(rootI, rootJ);
-    }, "union");
-    allPartialCaveIds.forEach((id) => parent.set(id, id));
-    for (const caveIds of partialHashToCaves.values()) {
-      if (caveIds.size <= 1) continue;
-      const ids = Array.from(caveIds);
-      for (let i = 1; i < ids.length; i++) union(ids[0], ids[i]);
-    }
-    const components = /* @__PURE__ */ new Map();
-    for (const id of allPartialCaveIds) {
-      const root = find(id);
-      if (!components.has(root)) components.set(root, /* @__PURE__ */ new Set());
-      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(" & "));
-    const totalFindings = similarPairs.text.size + similarPairs.global.size + partialGroups.length;
+    const totalFindings = similarPairs.text.size + similarPairs.image.size;
     if (totalFindings === 0) return "未发现高相似度的内容";
     let report = `已发现 ${totalFindings} 组高相似度的内容:`;
     if (similarPairs.text.size > 0) report += "\n文本内容相似:\n" + [...similarPairs.text].join("\n");
-    if (similarPairs.global.size > 0) report += "\n图片整体相似:\n" + [...similarPairs.global].join("\n");
-    if (partialGroups.length > 0) report += "\n图片局部相同:\n" + partialGroups.join("\n");
+    if (similarPairs.image.size > 0) report += "\n图片内容相似:\n" + [...similarPairs.image].join("\n");
     return report.trim();
   }
-  /**
-   * @description 为单个图片Buffer生成全局pHash和四个象限的局部pHash。
-   * @param imageBuffer - 图片的Buffer数据。
-   * @returns 包含全局哈希和四象限哈希的对象。
-   */
-  async generateAllImageHashes(imageBuffer) {
-    const globalHash = await this._generatePHash(imageBuffer, 256);
-    const { width, height } = await (0, import_sharp.default)(imageBuffer).metadata();
-    const w2 = Math.floor(width / 2), h22 = Math.floor(height / 2);
-    const regions = [
-      { left: 0, top: 0, width: w2, height: h22 },
-      { left: w2, top: 0, width: width - w2, height: h22 },
-      { left: 0, top: h22, width: w2, height: height - h22 },
-      { left: w2, top: h22, width: width - w2, height: height - h22 }
-    ];
-    const [q1, q2, q3, q4] = await Promise.all(
-      regions.map((region) => {
-        if (region.width < 16 || region.height < 16) return this._generatePHash(imageBuffer, 64);
-        return (0, import_sharp.default)(imageBuffer).extract(region).toBuffer().then((b) => this._generatePHash(b, 64));
-      })
-    );
-    return { globalHash, quadrantHashes: { q1, q2, q3, q4 } };
-  }
   /**
    * @description 执行二维离散余弦变换 (DCT-II)。
    * @param matrix - 输入的 N x N 像素亮度矩阵。
@@ -938,7 +875,7 @@ var HashManager = class {
    * @param size - 期望的哈希位数 (必须是完全平方数, 如 64 或 256)。
    * @returns 十六进制pHash字符串。
    */
-  async _generatePHash(imageBuffer, size) {
+  async generatePHash(imageBuffer, size) {
     const dctSize = 32;
     const hashGridSize = Math.sqrt(size);
     if (!Number.isInteger(hashGridSize)) throw new Error("哈希位数必须是完全平方数");
@@ -1032,7 +969,7 @@ var Config = import_koishi3.Schema.intersect([
     enableName: import_koishi3.Schema.boolean().default(false).description("启用自定义昵称"),
     enableIO: import_koishi3.Schema.boolean().default(false).description("启用导入导出"),
     adminChannel: import_koishi3.Schema.string().default("onebot:").description("管理群组 ID"),
-    caveFormat: import_koishi3.Schema.string().default("回声洞 ——（{id}）|—— {name}").description("自定义文本，用“|”分隔（占位符配置参见 README）")
+    caveFormat: import_koishi3.Schema.string().default("回声洞 ——（{id}）|—— {name}").description("自定义文本（参见 README）")
   }).description("基础配置"),
   import_koishi3.Schema.object({
     enablePend: import_koishi3.Schema.boolean().default(false).description("启用审核"),

package/package.json

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

package/readme.md

@@ -62,7 +62,7 @@
 | `enableName` | `boolean` | `false` | 是否启用自定义昵称功能 (`cave.name` 指令)。 |
 | `enableIO` | `boolean` | `false` | 是否启用数据导入/导出功能 (`cave.export` / `.import` 指令)。 |
 | `adminChannel` | `string` | `'onebot:'` | **管理群组ID**。格式为 `平台名:群号`，如 `onebot:12345678`。管理指令仅在此群组生效。若配置无效，审核将自动通过。 |
-| `caveFormat` | `string` | `'回声洞 ——（{id}）\|—— {name}'` | 回声洞消息的显示格式。`\|`作为分隔符，前面是页眉，后面是页脚。可用占位符：`{id}`, `{name}`, `{time}`, `{user}` 和 `{channel}` 。支持打码，语法为 `{最大星号数:占位符:保留前缀:保留后缀}`，例如 `{3:user:2:2}`。 |
+| `caveFormat` | `string` | `'回声洞 ——（{id}）\|—— {*name}'` | 回声洞消息的显示格式。`\|`为页眉页脚分隔符。支持强大的占位符语法：• **基本**: `{id}`, `{name}`, `{time}`, `{user}`, `{channel}`• **自动打码**: `{*user}` (在占位符前加\*)• **审核可见**: `{/channel}` (在占位符前加/)• **组合**: `{*user/user}` (常规打码/审核时完整) |
 
 ### 复核配置 (审核与查重)