koishi-plugin-best-cave 2.3.8 → 2.3.10

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/Utils.d.ts

@@ -50,9 +50,11 @@ export declare function updateCooldownTimestamp(session: Session, config: Config
  * @param sourceElements 原始的 Koishi 消息元素数组。
  * @param newId 这条回声洞的新 ID。
  * @param session 触发操作的会话。
+ * @param config 插件配置。
+ * @param logger 日志实例。
  * @returns 包含数据库元素和待保存媒体列表的对象。
  */
-export declare function processMessageElements(sourceElements: h[], newId: number, session: Session): Promise<{
+export declare function processMessageElements(sourceElements: h[], newId: number, session: Session, config: Config, logger: Logger): Promise<{
     finalElementsForDb: StoredElement[];
     mediaToSave: {
         sourceUrl: string;

package/lib/index.d.ts

@@ -48,6 +48,7 @@ export interface Config {
     secretAccessKey?: string;
     bucket?: string;
     publicUrl?: string;
+    debug: boolean;
 }
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config: Config): void;

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");
@@ -406,7 +404,7 @@ function updateCooldownTimestamp(session, config, lastUsed) {
   }
 }
 __name(updateCooldownTimestamp, "updateCooldownTimestamp");
-async function processMessageElements(sourceElements, newId, session) {
+async function processMessageElements(sourceElements, newId, session, config, logger2) {
   const mediaToSave = [];
   let mediaIndex = 0;
   async function transform(elements) {
@@ -422,22 +420,33 @@ async function processMessageElements(sourceElements, newId, session) {
       if (type === "text" && el.attrs.content?.trim()) {
         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) {
-        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.message) {
+            const parsedMessage = import_koishi.h.parse(node.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}`;
+          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) {
-        result.push(...await transform(el.children));
       }
     }
     return result;
@@ -997,7 +1006,10 @@ var Config = import_koishi3.Schema.intersect([
     region: import_koishi3.Schema.string().default("auto").description("区域 (Region)"),
     accessKeyId: import_koishi3.Schema.string().description("Access Key ID").role("secret"),
     secretAccessKey: import_koishi3.Schema.string().description("Secret Access Key").role("secret")
-  }).description("存储配置")
+  }).description("存储配置"),
+  import_koishi3.Schema.object({
+    debug: import_koishi3.Schema.boolean().default(false).description("启用调试模式，将在控制台输出详细的操作日志。")
+  }).description("开发配置")
 ]);
 function apply(ctx, config) {
   ctx.model.extend("cave", {
@@ -1015,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}`);
@@ -1040,18 +1052,31 @@ function apply(ctx, config) {
   });
   cave.subcommand(".add [content:text]", "添加回声洞").usage("添加一条回声洞。可直接发送内容，也可回复或引用消息。").action(async ({ session }, content) => {
     try {
-      let sourceElements = session.quote?.elements;
-      if (!sourceElements && content?.trim()) {
+      let sourceElements;
+      if (session.quote?.elements) {
+        sourceElements = session.quote.elements;
+      } else if (content?.trim()) {
         sourceElements = import_koishi3.h.parse(content);
-      }
-      if (!sourceElements) {
+      } else {
         await session.send("请在一分钟内发送你要添加的内容");
         const reply = await session.prompt(6e4);
         if (!reply) return "等待操作超时";
         sourceElements = import_koishi3.h.parse(reply);
       }
+      if (config.debug) {
+        logger.info(`获取到的消息内容 (sourceElements): 
+${JSON.stringify(sourceElements, null, 2)}`);
+        logger.info(`完整的会话对象 (session): 
+${JSON.stringify(session, null, 2)}`);
+      }
       const newId = await getNextCaveId(ctx, getScopeQuery(session, config, false), reusableIds);
-      const { finalElementsForDb, mediaToSave } = await processMessageElements(sourceElements, newId, session);
+      const { finalElementsForDb, mediaToSave } = await processMessageElements(sourceElements, newId, session, config, logger);
+      if (config.debug) {
+        logger.info(`提取后数据库元素(finalElementsForDb): 
+${JSON.stringify(finalElementsForDb, null, 2)}`);
+        logger.info(`提取后待存媒体(mediaToSave): 
+${JSON.stringify(mediaToSave, null, 2)}`);
+      }
       if (finalElementsForDb.length === 0) return "无可添加内容";
       const textHashesToStore = [];
       if (hashManager) {

package/package.json

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