koishi-plugin-best-cave 2.3.9 → 2.3.11

package/lib/DataManager.d.ts

@@ -1,6 +1,5 @@
 import { Context, Logger } from 'koishi';
 import { FileManager } from './FileManager';
-import { HashManager } from './HashManager';
 import { Config } from './index';
 /**
  * @class DataManager
@@ -11,16 +10,14 @@ export declare class DataManager {
     private config;
     private fileManager;
     private logger;
-    private hashManager;
     /**
      * @constructor
      * @param ctx Koishi 上下文，用于数据库操作。
      * @param config 插件配置。
      * @param fileManager 文件管理器实例。
      * @param logger 日志记录器实例。
-     * @param hashManager 哈希管理器实例，用于增量更新哈希。
      */
-    constructor(ctx: Context, config: Config, fileManager: FileManager, logger: Logger, hashManager: HashManager | null);
+    constructor(ctx: Context, config: Config, fileManager: FileManager, logger: Logger);
     /**
      * @description 注册 `.export` 和 `.import` 子命令。
      * @param cave - 主 `cave` 命令实例。

package/lib/index.js

@@ -216,14 +216,12 @@ var DataManager = class {
    * @param config 插件配置。
    * @param fileManager 文件管理器实例。
    * @param logger 日志记录器实例。
-   * @param hashManager 哈希管理器实例，用于增量更新哈希。
    */
-  constructor(ctx, config, fileManager, logger2, hashManager) {
+  constructor(ctx, config, fileManager, logger2) {
     this.ctx = ctx;
     this.config = config;
     this.fileManager = fileManager;
     this.logger = logger2;
-    this.hashManager = hashManager;
   }
   static {
     __name(this, "DataManager");
@@ -415,37 +413,40 @@ async function processMessageElements(sourceElements, newId, session, config, lo
     const defaultExtMap = { "image": ".jpg", "video": ".mp4", "audio": ".mp3", "file": ".dat" };
     for (const el of elements) {
       const type = typeMap[el.type];
-      if (config.debug) logger2.info(`正在处理元素 <${el.type}>, 映射类型: ${type || "无"}`);
       if (!type) {
         if (el.children) result.push(...await transform(el.children));
         continue;
       }
       if (type === "text" && el.attrs.content?.trim()) {
-        const content = el.attrs.content.trim();
-        if (config.debug) logger2.info(`发现 [text] 元素，内容: "${content}"`);
-        result.push({ type: "text", content });
+        result.push({ type: "text", content: el.attrs.content.trim() });
       } else if (type === "at" && el.attrs.id) {
         if (config.debug) logger2.info(`发现 [at] 元素，ID: "${el.attrs.id}"`);
         result.push({ type: "at", content: el.attrs.id });
-      } else if (type === "forward" && el.children?.length) {
-        if (config.debug) logger2.info(`发现 [forward] 元素，开始递归解析子元素...`);
-        const transformedChildren = await transform(el.children);
-        result.push({ type: "forward", content: JSON.stringify(transformedChildren) });
+      } else if (type === "forward" && Array.isArray(el.attrs.content)) {
+        if (config.debug) logger2.info(`发现 [forward] 元素，开始解析 el.attrs.content...`);
+        const allChildElements = [];
+        for (const node of el.attrs.content) {
+          const senderInfo = `${node.sender?.nickname || node.sender?.user_id}:`;
+          allChildElements.push({ type: "text", content: senderInfo });
+          if (node.raw_message) {
+            const parsedMessage = import_koishi.h.parse(node.raw_message);
+            const transformedMessage = await transform(parsedMessage);
+            allChildElements.push(...transformedMessage);
+          }
+        }
+        result.push({ type: "forward", content: JSON.stringify(allChildElements) });
       } else if (["image", "video", "audio", "file"].includes(type) && el.attrs.src) {
         let fileIdentifier = el.attrs.src;
         if (config.debug) logger2.info(`发现 [${type}] 元素，src: "${fileIdentifier}"`);
         if (fileIdentifier.startsWith("http")) {
           const ext = path2.extname(el.attrs.file || "") || defaultExtMap[type];
           const currentMediaIndex = ++mediaIndex;
-          const fileName = `${newId}_${currentMediaIndex}_${session.channelId || "private"}_${session.userId}${ext}`;
-          if (config.debug) logger2.info(`[${type}] 是远程文件，文件名: "${fileName}"`);
+          const fileName = `${newId}_${currentMediaIndex}_${session.channelId || session.guildId}_${session.userId}${ext}`;
+          if (config.debug) logger2.info(`[${type}] 是远程文件，已加入待保存列表。文件名: "${fileName}"`);
           mediaToSave.push({ sourceUrl: fileIdentifier, fileName });
           fileIdentifier = fileName;
         }
         result.push({ type, file: fileIdentifier });
-      } else if (el.children) {
-        if (config.debug) logger2.info(`元素 <${el.type}> 无直接内容，递归其子元素...`);
-        result.push(...await transform(el.children));
       }
     }
     return result;
@@ -1026,7 +1027,7 @@ function apply(ctx, config) {
   const profileManager = config.enableName ? new NameManager(ctx) : null;
   const reviewManager = config.enablePend ? new PendManager(ctx, config, fileManager, logger, reusableIds) : null;
   const hashManager = config.enableSimilarity ? new HashManager(ctx, config, logger, fileManager) : null;
-  const dataManager = config.enableIO ? new DataManager(ctx, config, fileManager, logger, hashManager) : null;
+  const dataManager = config.enableIO ? new DataManager(ctx, config, fileManager, logger) : null;
   const cave = ctx.command("cave", "回声洞").option("add", "-a <content:text> 添加回声洞").option("view", "-g <id:posint> 查看指定回声洞").option("delete", "-r <id:posint> 删除指定回声洞").option("list", "-l 查询投稿统计").usage("随机抽取一条已添加的回声洞。").action(async ({ session, options }) => {
     if (options.add) return session.execute(`cave.add ${options.add}`);
     if (options.view) return session.execute(`cave.view ${options.view}`);
@@ -1052,22 +1053,17 @@ function apply(ctx, config) {
   cave.subcommand(".add [content:text]", "添加回声洞").usage("添加一条回声洞。可直接发送内容，也可回复或引用消息。").action(async ({ session }, content) => {
     try {
       let sourceElements;
-      let sourceOrigin = "";
       if (session.quote?.elements) {
         sourceElements = session.quote.elements;
-        sourceOrigin = "引用(quote)";
       } else if (content?.trim()) {
         sourceElements = import_koishi3.h.parse(content);
-        sourceOrigin = `指令参数(content)`;
       } else {
         await session.send("请在一分钟内发送你要添加的内容");
         const reply = await session.prompt(6e4);
         if (!reply) return "等待操作超时";
         sourceElements = import_koishi3.h.parse(reply);
-        sourceOrigin = `用户回复(prompt)`;
       }
       if (config.debug) {
-        logger.info(`内容来源: ${sourceOrigin}`);
         logger.info(`获取到的消息内容 (sourceElements): 
 ${JSON.stringify(sourceElements, null, 2)}`);
         logger.info(`完整的会话对象 (session): 

package/package.json

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