koishi-plugin-chat-analyse 0.4.9 → 0.5.0

package/lib/index.js

@@ -43,15 +43,19 @@ var import_koishi6 = require("koishi");
 var import_koishi = require("koishi");
 var Collector = class _Collector {
   /**
-   * @constructor
-   * @param {Context} ctx - Koishi 的插件上下文。
-   * @param {Config} config - 插件的配置对象。
+   * @param ctx - Koishi 的插件上下文。
+   * @param config - 插件的配置对象。
    */
   constructor(ctx, config) {
     this.ctx = ctx;
     this.config = config;
-    this.defineModels();
-    ctx.on("message", (session) => this.handleMessage(session));
+    this.ctx.model.extend("analyse_user", { uid: "unsigned", channelId: "string", userId: "string", channelName: "string", userName: "string" }, { primary: "uid", autoInc: true, indexes: ["channelId", "userId"] });
+    this.ctx.model.extend("analyse_cmd", { uid: "unsigned", command: "string", count: "unsigned", timestamp: "timestamp" }, { primary: ["uid", "command"] });
+    this.ctx.model.extend("analyse_msg", { uid: "unsigned", type: "string", count: "unsigned", timestamp: "timestamp" }, { primary: ["uid", "type"] });
+    this.ctx.model.extend("analyse_rank", { uid: "unsigned", type: "string", count: "unsigned", timestamp: "timestamp" }, { primary: ["uid", "timestamp", "type"] });
+    if (this.config.enableOriRecord) this.ctx.model.extend("analyse_cache", { id: "unsigned", uid: "unsigned", content: "text", timestamp: "timestamp" }, { primary: "id", autoInc: true, indexes: ["uid", "timestamp"] });
+    if (this.config.enableWhoAt) this.ctx.model.extend("analyse_at", { id: "unsigned", uid: "unsigned", target: "string", content: "text", timestamp: "timestamp" }, { primary: "id", autoInc: true, indexes: ["target", "uid"] });
+    ctx.on("message", (session) => this.onMessage(session));
     this.flushInterval = setInterval(() => this.flushBuffers(), _Collector.FLUSH_INTERVAL);
     ctx.on("dispose", () => {
       clearInterval(this.flushInterval);
@@ -61,268 +65,134 @@ var Collector = class _Collector {
   static {
     __name(this, "Collector");
   }
-  /** @const {number} FLUSH_INTERVAL - 内存缓存区自动刷新到数据库的时间间隔。 */
-  static FLUSH_INTERVAL = 60 * 1e3;
-  /** @const {number} BUFFER_THRESHOLD - 内存缓存区触发自动刷新的消息数量阈值。 */
+  /** @property FLUSH_INTERVAL - 内存缓存区定时刷入数据库的间隔（毫秒）。 */
+  static FLUSH_INTERVAL = import_koishi.Time.minute;
+  /** @property BUFFER_THRESHOLD - 内存缓存区触发刷新的消息数量阈值。 */
   static BUFFER_THRESHOLD = 100;
-  // 统一的缓冲区
+  // 统一的数据缓冲区
   msgStatBuffer = /* @__PURE__ */ new Map();
   rankStatBuffer = /* @__PURE__ */ new Map();
   cmdStatBuffer = /* @__PURE__ */ new Map();
   oriCacheBuffer = [];
   whoAtBuffer = [];
-  // 用户缓存
   userCache = /* @__PURE__ */ new Map();
   pendingUserRequests = /* @__PURE__ */ new Map();
   flushInterval;
   /**
-   * @private
-   * @method defineModels
-   * @description 定义插件所需的所有数据表模型。
-   */
-  defineModels() {
-    this.ctx.model.extend("analyse_user", {
-      uid: "unsigned",
-      channelId: "string",
-      userId: "string",
-      channelName: "string",
-      userName: "string"
-    }, { primary: "uid", autoInc: true, indexes: ["channelId", "userId"] });
-    this.ctx.model.extend("analyse_cmd", {
-      uid: "unsigned",
-      command: "string",
-      count: "unsigned",
-      timestamp: "timestamp"
-    }, { primary: ["uid", "command"] });
-    this.ctx.model.extend("analyse_msg", {
-      uid: "unsigned",
-      type: "string",
-      count: "unsigned",
-      timestamp: "timestamp"
-    }, { primary: ["uid", "type"] });
-    this.ctx.model.extend("analyse_rank", {
-      uid: "unsigned",
-      type: "string",
-      count: "unsigned",
-      timestamp: "timestamp"
-    }, { primary: ["uid", "timestamp", "type"] });
-    if (this.config.enableOriRecord) {
-      this.ctx.model.extend("analyse_cache", {
-        id: "unsigned",
-        uid: "unsigned",
-        content: "text",
-        timestamp: "timestamp"
-      }, { primary: "id", autoInc: true, indexes: ["uid", "timestamp"] });
-    }
-    if (this.config.enableWhoAt) {
-      this.ctx.model.extend("analyse_at", {
-        id: "unsigned",
-        uid: "unsigned",
-        target: "string",
-        content: "text",
-        timestamp: "timestamp"
-      }, { primary: "id", autoInc: true, indexes: ["target", "uid"] });
-    }
-  }
-  /**
-   * @private
-   * @async
-   * @method handleMessage
-   * @description 统一的消息和命令处理器。它会解析收到的消息，提取关键信息并更新相应的统计数据。
-   * @param {Session} session - Koishi 的会话对象，包含消息的全部信息。
+   * @private @method onMessage
+   * @description 统一的消息事件处理器，解析消息并更新各类统计数据的缓冲区。
+   * @param session - Koishi 的会话对象。
    */
-  async handleMessage(session) {
-    try {
-      const { userId, channelId, guildId, content, timestamp, argv, elements } = session;
-      const effectiveId = channelId || guildId;
-      if (!effectiveId || !userId || !timestamp || !content?.trim()) return;
-      const user = await this.getOrCreateCachedUser(session, effectiveId);
-      if (!user) return;
-      const { uid } = user;
-      const messageTime = new Date(timestamp);
-      if (argv?.command) {
-        const key = `${uid}:${argv.command.name}`;
-        const existing = this.cmdStatBuffer.get(key);
-        if (existing) {
-          existing.count++;
-          existing.timestamp = messageTime;
-        } else {
-          this.cmdStatBuffer.set(key, { uid, command: argv.command.name, count: 1, timestamp: messageTime });
-        }
-      }
-      const hourStart = new Date(messageTime.getFullYear(), messageTime.getMonth(), messageTime.getDate(), messageTime.getHours());
-      const uniqueElementTypes = new Set(elements.map((e) => e.type));
-      for (const type of uniqueElementTypes) {
-        const msgKey = `${uid}:${type}`;
-        const existingMsg = this.msgStatBuffer.get(msgKey);
-        if (existingMsg) {
-          existingMsg.count++;
-          existingMsg.timestamp = messageTime;
-        } else {
-          this.msgStatBuffer.set(msgKey, { uid, type, count: 1, timestamp: messageTime });
-        }
-        const rankKey = `${uid}:${hourStart.toISOString()}:${type}`;
-        const existingRank = this.rankStatBuffer.get(rankKey);
-        if (existingRank) {
-          existingRank.count++;
-        } else {
-          this.rankStatBuffer.set(rankKey, { uid, timestamp: hourStart, type, count: 1 });
-        }
-      }
-      if (this.config.enableWhoAt) {
-        const atElements = elements.filter((e) => e.type === "at");
-        if (atElements.length > 0) {
-          const contentElements = elements.filter((e) => e.type !== "at");
-          const sanitizedContent = this.sanitizeContent(contentElements);
-          for (const atElement of atElements) {
-            const targetId = atElement.attrs.id;
-            if (targetId && targetId !== userId) this.whoAtBuffer.push({ uid, target: targetId, content: sanitizedContent, timestamp: messageTime });
+  async onMessage(session) {
+    const { userId, channelId, content, timestamp, argv, elements, bot } = session;
+    if (!channelId || !userId || !content?.trim()) return;
+    const cacheKey = `${channelId}:${userId}`;
+    let user;
+    if (this.userCache.has(cacheKey)) {
+      user = this.userCache.get(cacheKey);
+    } else if (this.pendingUserRequests.has(cacheKey)) {
+      user = await this.pendingUserRequests.get(cacheKey);
+    } else {
+      const promise = (async () => {
+        try {
+          const [dbUser] = await this.ctx.database.get("analyse_user", { channelId, userId });
+          const currentUserName = session.username ?? "";
+          const guild = await bot.getGuild(channelId).catch(() => null);
+          const currentChannelName = guild?.name ?? "";
+          if (dbUser) {
+            if (currentUserName && dbUser.userName !== currentUserName || currentChannelName && dbUser.channelName !== currentChannelName) {
+              await this.ctx.database.set("analyse_user", { uid: dbUser.uid }, { userName: currentUserName, channelName: currentChannelName });
+              dbUser.userName = currentUserName;
+              dbUser.channelName = currentChannelName;
+            }
+            this.userCache.set(cacheKey, dbUser);
+            return dbUser;
           }
+          const createdUser = await this.ctx.database.create("analyse_user", { channelId, userId, userName: currentUserName, channelName: currentChannelName });
+          this.userCache.set(cacheKey, createdUser);
+          return createdUser;
+        } catch (error) {
+          this.ctx.logger.error(`创建或获取用户(${cacheKey})失败:`, error);
+          return null;
+        } finally {
+          this.pendingUserRequests.delete(cacheKey);
         }
-      }
-      if (this.config.enableOriRecord) {
-        this.oriCacheBuffer.push({
-          uid,
-          content: this.sanitizeContent(elements),
-          timestamp: messageTime
-        });
-        if (this.oriCacheBuffer.length >= _Collector.BUFFER_THRESHOLD) await this.flushBuffers();
-      }
-    } catch (error) {
-      this.ctx.logger.warn("消息处理出错:", error);
+      })();
+      this.pendingUserRequests.set(cacheKey, promise);
+      user = await promise;
     }
-  }
-  /**
-   * @private
-   * @async
-   * @method getOrCreateCachedUser
-   * @description 高效地获取或创建用户的中央记录，并全面利用缓存。
-   * @param {Session} session - Koishi 会话对象，用于获取用户信息和 Bot 实例。
-   * @param {string} channelId - 消息所在的频道或群组 ID。
-   * @returns {Promise<UserCache | null>} 返回用户的缓存对象，如果操作失败则返回 `null`。
-   */
-  async getOrCreateCachedUser(session, channelId) {
-    const { userId, guildId, bot } = session;
-    const effectiveId = guildId || channelId;
-    const cacheKey = `${effectiveId}:${userId}`;
-    if (this.userCache.has(cacheKey)) return this.userCache.get(cacheKey);
-    if (this.pendingUserRequests.has(cacheKey)) return this.pendingUserRequests.get(cacheKey);
-    const promise = (async () => {
-      try {
-        const dbUsers = await this.ctx.database.get("analyse_user", { channelId: effectiveId, userId });
-        const dbUser = dbUsers[0];
-        const currentUserName = session.username || "";
-        let currentChannelName = "";
-        if (effectiveId && bot.getGuild) {
-          const guild = await bot.getGuild(effectiveId);
-          currentChannelName = guild?.name || "";
-        }
-        if (dbUser) {
-          const nameChanged = currentUserName && dbUser.userName !== currentUserName;
-          const channelNameChanged = currentChannelName && dbUser.channelName !== currentChannelName;
-          if (nameChanged || channelNameChanged) {
-            dbUser.userName = nameChanged ? currentUserName : dbUser.userName;
-            dbUser.channelName = channelNameChanged ? currentChannelName : dbUser.channelName;
-            await this.ctx.database.set("analyse_user", { uid: dbUser.uid }, {
-              userName: dbUser.userName,
-              channelName: dbUser.channelName
-            });
-          }
-          this.userCache.set(cacheKey, dbUser);
-          return dbUser;
+    if (!user) return;
+    const { uid } = user;
+    const messageTime = new Date(timestamp);
+    if (argv?.command) {
+      const key = `${uid}:${argv.command.name}`;
+      const entry = this.cmdStatBuffer.get(key) ?? { uid, command: argv.command.name, count: 0, timestamp: messageTime };
+      entry.count++;
+      entry.timestamp = messageTime;
+      this.cmdStatBuffer.set(key, entry);
+    }
+    const hourStart = new Date(messageTime.getFullYear(), messageTime.getMonth(), messageTime.getDate(), messageTime.getHours());
+    for (const type of new Set(elements.map((e) => e.type))) {
+      const msgKey = `${uid}:${type}`;
+      const msgEntry = this.msgStatBuffer.get(msgKey) ?? { uid, type, count: 0, timestamp: messageTime };
+      msgEntry.count++;
+      msgEntry.timestamp = messageTime;
+      this.msgStatBuffer.set(msgKey, msgEntry);
+      const rankKey = `${uid}:${hourStart.toISOString()}:${type}`;
+      const rankEntry = this.rankStatBuffer.get(rankKey) ?? { uid, timestamp: hourStart, type, count: 0 };
+      rankEntry.count++;
+      this.rankStatBuffer.set(rankKey, rankEntry);
+    }
+    if (this.config.enableWhoAt) {
+      const sanitizedContent = this.sanitizeContent(elements.filter((e) => e.type !== "at"));
+      for (const atElement of elements.filter((e) => e.type === "at")) {
+        const targetId = atElement.attrs.id;
+        if (targetId && targetId !== userId) {
+          this.whoAtBuffer.push({ uid, target: targetId, content: sanitizedContent, timestamp: messageTime });
         }
-        const createdUser = await this.ctx.database.create("analyse_user", {
-          channelId: effectiveId,
-          userId,
-          userName: currentUserName,
-          channelName: currentChannelName
-        });
-        this.userCache.set(cacheKey, createdUser);
-        return createdUser;
-      } catch (error) {
-        this.ctx.logger.error(`创建或获取用户(${cacheKey})失败:`, error);
-        return null;
-      } finally {
-        this.pendingUserRequests.delete(cacheKey);
       }
-    })();
-    this.pendingUserRequests.set(cacheKey, promise);
-    return promise;
+    }
+    if (this.config.enableOriRecord) {
+      this.oriCacheBuffer.push({ uid, content: this.sanitizeContent(elements), timestamp: messageTime });
+      if (this.oriCacheBuffer.length >= _Collector.BUFFER_THRESHOLD) await this.flushBuffers();
+    }
   }
   /**
-   * @private
-   * @method sanitizeContent
-   * @description 将 Koishi 的消息元素 (Element) 数组净化为纯文本字符串，以便存储和分析。
-   * @param {Element[]} elements - 消息元素的数组。
-   * @returns {string} 净化后的纯文本字符串。
+   * @private @method sanitizeContent
+   * @description 将 Koishi 消息元素数组净化为纯文本字符串。
+   * @param elements - 消息元素数组。
+   * @returns 净化后的纯文本。
    */
-  sanitizeContent = /* @__PURE__ */ __name((elements) => elements.map((e) => {
-    switch (e.type) {
-      case "text":
-        return e.attrs.content;
-      case "img":
-        return e.attrs.summary === "[动画表情]" ? "[gif]" : "[img]";
-      case "at":
-        return `[at:${e.attrs.id}]`;
-      default:
-        return `[${e.type}]`;
-    }
-  }).join(""), "sanitizeContent");
+  sanitizeContent = /* @__PURE__ */ __name((elements) => import_koishi.h.transform(elements, {
+    text: /* @__PURE__ */ __name((attrs) => attrs.content, "text"),
+    img: /* @__PURE__ */ __name((attrs) => attrs.summary === "[动画表情]" ? "[gif]" : "[img]", "img"),
+    at: /* @__PURE__ */ __name((attrs) => `[at:${attrs.id}]`, "at")
+  }, "").join(""), "sanitizeContent");
   /**
-   * @private
-   * @async
-   * @method flushBuffers
-   * @description 将所有内存中的缓冲区数据批量写入数据库。
+   * @private @method flushBuffers
+   * @description 将所有内存中的数据缓冲区批量写入数据库，并清空缓冲区。
    */
   async flushBuffers() {
-    const cmdBufferToFlush = Array.from(this.cmdStatBuffer.values());
-    const msgBufferToFlush = Array.from(this.msgStatBuffer.values());
-    const rankBufferToFlush = Array.from(this.rankStatBuffer.values());
-    const oriCacheBufferToFlush = this.oriCacheBuffer;
-    const whoAtBufferToFlush = this.whoAtBuffer;
+    const buffers = {
+      cmd: Array.from(this.cmdStatBuffer.values()),
+      msg: Array.from(this.msgStatBuffer.values()),
+      rank: Array.from(this.rankStatBuffer.values()),
+      at: this.whoAtBuffer,
+      cache: this.oriCacheBuffer
+    };
     this.cmdStatBuffer.clear();
     this.msgStatBuffer.clear();
     this.rankStatBuffer.clear();
-    this.oriCacheBuffer = [];
     this.whoAtBuffer = [];
+    this.oriCacheBuffer = [];
     try {
-      if (cmdBufferToFlush.length > 0) {
-        await this.ctx.database.upsert(
-          "analyse_cmd",
-          (row) => cmdBufferToFlush.map((item) => ({
-            uid: item.uid,
-            command: item.command,
-            count: import_koishi.$.add(import_koishi.$.ifNull(row.count, 0), item.count),
-            timestamp: item.timestamp
-          }))
-        );
-      }
-      if (msgBufferToFlush.length > 0) {
-        await this.ctx.database.upsert(
-          "analyse_msg",
-          (row) => msgBufferToFlush.map((item) => ({
-            uid: item.uid,
-            type: item.type,
-            count: import_koishi.$.add(import_koishi.$.ifNull(row.count, 0), item.count),
-            timestamp: item.timestamp
-          }))
-        );
-      }
-      if (rankBufferToFlush.length > 0) {
-        await this.ctx.database.upsert(
-          "analyse_rank",
-          (row) => rankBufferToFlush.map((item) => ({
-            uid: item.uid,
-            timestamp: item.timestamp,
-            type: item.type,
-            count: import_koishi.$.add(import_koishi.$.ifNull(row.count, 0), item.count)
-          }))
-        );
-      }
-      if (whoAtBufferToFlush.length > 0) await this.ctx.database.upsert("analyse_at", whoAtBufferToFlush);
-      if (oriCacheBufferToFlush.length > 0) await this.ctx.database.upsert("analyse_cache", oriCacheBufferToFlush);
+      if (buffers.cmd.length > 0) await this.ctx.database.upsert("analyse_cmd", (row) => buffers.cmd.map((item) => ({ ...item, count: import_koishi.$.add(import_koishi.$.ifNull(row.count, 0), item.count) })));
+      if (buffers.msg.length > 0) await this.ctx.database.upsert("analyse_msg", (row) => buffers.msg.map((item) => ({ ...item, count: import_koishi.$.add(import_koishi.$.ifNull(row.count, 0), item.count) })));
+      if (buffers.rank.length > 0) await this.ctx.database.upsert("analyse_rank", (row) => buffers.rank.map((item) => ({ ...item, count: import_koishi.$.add(import_koishi.$.ifNull(row.count, 0), item.count) })));
+      if (buffers.at.length > 0) await this.ctx.database.upsert("analyse_at", buffers.at);
+      if (buffers.cache.length > 0) await this.ctx.database.upsert("analyse_cache", buffers.cache);
     } catch (error) {
-      this.ctx.logger.error("写入数据出错:", error);
+      this.ctx.logger.error("数据库刷写失败:", error);
     }
   }
 };
@@ -334,7 +204,7 @@ var import_koishi3 = require("koishi");
 var import_koishi2 = require("koishi");
 var Renderer = class {
   /**
-   * @param {Context} ctx - Koishi 的插件上下文，用于访问核心服务如 `puppeteer` 和 `logger`。
+   * @param ctx - Koishi 的插件上下文，用于访问 `puppeteer` 等核心服务。
    */
   constructor(ctx) {
     this.ctx = ctx;
@@ -345,210 +215,76 @@ var Renderer = class {
   /**
    * @private
    * @method htmlToImage
-   * @description
-   * 负责将任意HTML字符串转换为PNG图片Buffer。
-   * @param {string} html - 要渲染的HTML主体内容（不包含 `<html>` 和 `<body>` 标签）。
-   * @returns {Promise<Buffer>} 返回一个包含PNG图片数据的 Buffer 对象。
-   * @throws {Error} 如果 Puppeteer 截图过程中发生错误，将抛出异常。
+   * @description 将 HTML 字符串转换为 PNG 图片 Buffer。
+   * @param html - 要渲染的 HTML 主体内容。
+   * @returns 返回一个包含 PNG 图片数据的 Buffer。
    */
   async htmlToImage(html) {
-    let page = null;
+    const page = await this.ctx.puppeteer.page();
     try {
-      page = await this.ctx.puppeteer.page();
       await page.setViewport({ width: 720, height: 1080, deviceScaleFactor: 2 });
-      await page.setContent(`
-        <!DOCTYPE html>
-        <html>
-          <head>
-            <meta charset="UTF-8">
-            <meta name="viewport" content="width=device-width, initial-scale=1.0">
-            <style>
-              :root {
-                --card-bg: #ffffff; --text-color: #111827; --header-color: #111827;
-                --sub-text-color: #6b7280; --border-color: #e5e7eb; --accent-color: #4a6ee0;
-                --chip-bg: #f3f4f6; --stripe-bg: #f9fafb; --gold: #f59e0b; --silver: #9ca3af; --bronze: #a16207;
-              }
-              body {
-                display: inline-block; /* Crucial for shrink-wrapping */
-                font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
-                background: transparent; margin: 0; padding: 8px;
-                -webkit-font-smoothing: antialiased;
-              }
-              .container {
-                display: inline-block; background: var(--card-bg);
-                border-radius: 12px; padding: 0; overflow: hidden;
-                box-shadow: 0 2px 4px rgba(0,0,0,0.05);
-              }
-              .header { padding: 10px 14px; }
-              .header-table { border-collapse: collapse; width: 100%; }
-              .header-table-left, .header-table-right { width: 1%; white-space: nowrap; }
-              .header-table-left { text-align: left; }
-              .header-table-center { text-align: center; }
-              .header-table-right { text-align: right; }
-              .title-text { font-size: 18px; font-weight: 600; color: var(--header-color); margin: 0; }
-              .stat-chip, .time-label {
-                display: inline-flex; align-items: baseline; padding: 4px 8px; border-radius: 8px;
-                background: var(--chip-bg); font-size: 13px; color: var(--sub-text-color);
-              }
-              .stat-chip span { font-weight: 600; color: var(--text-color); margin-left: 4px; }
-              .table-container { border-top: 1px solid var(--border-color); }
-              .main-table { border-collapse: collapse; width: 100%; }
-              .main-table th, .main-table td {
-                padding: 8px 14px;
-                vertical-align: middle;
-              }
-              .main-table th {
-                font-size: 12px; font-weight: 500; color: var(--sub-text-color);
-                text-transform: uppercase; letter-spacing: 0.05em; background: var(--stripe-bg);
-              }
-              .main-table td { font-size: 14px; color: var(--text-color); }
-              .main-table tbody tr:nth-child(even) { background-color: var(--stripe-bg); }
-              .main-table .name-cell, .main-table .name-header { text-align: left; }
-              .main-table .rank-cell, .main-table .count-cell, .main-table .date-cell, .main-table .percent-cell, .main-table .header-right-align {
-                text-align: right;
-                white-space: nowrap;
-                width: 1%;
-                font-variant-numeric: tabular-nums;
-              }
-              .name-cell { font-weight: 500; }
-              .rank-cell { font-weight: 500; color: var(--sub-text-color); }
-              .count-cell { font-weight: 600; color: var(--accent-color); }
-              .date-cell { color: var(--sub-text-color); }
-              .rank-gold, .rank-silver, .rank-bronze { font-weight: 600; }
-              .rank-gold { color: var(--gold) !important; }
-              .rank-silver { color: var(--silver) !important; }
-              .rank-bronze { color: var(--bronze) !important; }
-              .percent-cell { position: relative; }
-              .percent-bar { position: absolute; top: 0; right: 0; height: 100%; background-color: var(--accent-color); opacity: 0.15; }
-              .percent-text { position: relative; z-index: 1; }
-            </style>
-          </head>
-          <body>${html}</body>
-        </html>
-      `, { waitUntil: "networkidle0" });
-      const dimensions = await page.evaluate(() => {
-        const el = document.body;
-        return {
-          width: el.scrollWidth,
-          height: el.scrollHeight
-        };
-      });
+      await page.setContent(`<!DOCTYPE html><html><head><meta charset="UTF-8"><style>:root{--card-bg:#fff;--text-color:#111827;--header-color:#111827;--sub-text-color:#6b7280;--border-color:#e5e7eb;--accent-color:#4a6ee0;--chip-bg:#f3f4f6;--stripe-bg:#f9fafb;--gold:#f59e0b;--silver:#9ca3af;--bronze:#a16207}body{display:inline-block;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,'Helvetica Neue',Arial,sans-serif;background:0 0;margin:0;padding:8px;-webkit-font-smoothing:antialiased}.container{display:inline-block;background:var(--card-bg);border-radius:12px;padding:0;overflow:hidden;box-shadow:0 2px 4px rgba(0,0,0,.05)}.header{padding:10px 14px}.header-table{border-collapse:collapse;width:100%}.header-table-left,.header-table-right{width:1%;white-space:nowrap}.header-table-left{text-align:left}.header-table-center{text-align:center}.header-table-right{text-align:right}.title-text{font-size:18px;font-weight:600;color:var(--header-color);margin:0}.stat-chip,.time-label{display:inline-flex;align-items:baseline;padding:4px 8px;border-radius:8px;background:var(--chip-bg);font-size:13px;color:var(--sub-text-color)}.stat-chip span{font-weight:600;color:var(--text-color);margin-left:4px}.table-container{border-top:1px solid var(--border-color)}.main-table{border-collapse:collapse;width:100%}.main-table th,.main-table td{padding:8px 14px;vertical-align:middle}.main-table th{font-size:12px;font-weight:500;color:var(--sub-text-color);text-transform:uppercase;letter-spacing:.05em;background:var(--stripe-bg)}.main-table td{font-size:14px;color:var(--text-color)}.main-table tbody tr:nth-child(even){background-color:var(--stripe-bg)}.main-table .name-cell,.main-table .name-header{text-align:left}.main-table .rank-cell,.main-table .count-cell,.main-table .date-cell,.main-table .percent-cell,.main-table .header-right-align{text-align:right;white-space:nowrap;width:1%;font-variant-numeric:tabular-nums}.name-cell{font-weight:500}.rank-cell{font-weight:500;color:var(--sub-text-color)}.count-cell{font-weight:600;color:var(--accent-color)}.date-cell{color:var(--sub-text-color)}.rank-gold,.rank-silver,.rank-bronze{font-weight:600}.rank-gold{color:var(--gold)!important}.rank-silver{color:var(--silver)!important}.rank-bronze{color:var(--bronze)!important}.percent-cell{position:relative}.percent-bar{position:absolute;top:0;right:0;height:100%;background-color:var(--accent-color);opacity:.15}.percent-text{position:relative;z-index:1}</style></head><body>${html}</body></html>`, { waitUntil: "networkidle0" });
+      const dimensions = await page.evaluate(() => ({ width: document.body.scrollWidth, height: document.body.scrollHeight }));
       await page.setViewport({ ...dimensions, deviceScaleFactor: 2 });
       return await page.screenshot({ type: "png", fullPage: true, omitBackground: true });
     } catch (error) {
-      this.ctx.logger.error("图片渲染出错:", error);
+      this.ctx.logger.error("图片渲染失败:", error);
+      return null;
     } finally {
-      if (page) await page.close().catch(() => {
-      });
+      if (page) await page.close().catch((e) => this.ctx.logger.error("关闭页面失败:", e));
     }
   }
   /**
    * @private
    * @method formatDate
-   * @description
-   * 将 `Date` 对象格式化为人类友好的相对时间字符串。
-   * @param {Date} date - 需要格式化的日期对象。
-   * @returns {string} - 格式化后的时间字符串。
+   * @description 将 `Date` 对象格式化为易于理解的相对时间或绝对日期字符串。
+   * @param date - 需要格式化的日期对象。
+   * @returns 格式化后的时间字符串。
    */
   formatDate(date) {
     if (!date) return "未知";
     const diff = Date.now() - date.getTime();
     if (diff < import_koishi2.Time.minute) return "刚刚";
-    if (diff > 365 * import_koishi2.Time.day) {
-      return date.toLocaleDateString("zh-CN", { year: "numeric", month: "2-digit", day: "2-digit" }).replace(/\//g, "-");
-    }
-    const timeUnits = [
-      ["月", 30 * import_koishi2.Time.day],
-      ["天", import_koishi2.Time.day],
-      ["时", import_koishi2.Time.hour],
-      ["分", import_koishi2.Time.minute]
-    ];
-    let remainingDiff = diff;
-    const parts = [];
+    if (diff > 365 * import_koishi2.Time.day) return date.toLocaleDateString("zh-CN").replace(/\//g, "-");
+    const timeUnits = [["月", 30 * import_koishi2.Time.day], ["天", import_koishi2.Time.day], ["时", import_koishi2.Time.hour], ["分", import_koishi2.Time.minute]];
     for (const [unit, ms] of timeUnits) {
-      if (remainingDiff >= ms) {
-        const value = Math.floor(remainingDiff / ms);
-        parts.push(`${value}${unit}`);
-        remainingDiff %= ms;
+      if (diff >= ms) {
+        return `${Math.floor(diff / ms)}${unit}前`;
       }
     }
-    const result = parts.slice(0, 2).join("");
-    return `${result}前`;
+    return "刚刚";
   }
   /**
    * @public
    * @method renderList
-   * @description
-   * 接收一个标准化的 `ListRenderData` 对象和可选的表头数组，
-   * 然后构建一个包含标题、统计信息和数据表格的完整HTML卡片。
-   * @param {ListRenderData} data - 包含渲染所需全部信息的对象。
-   * @param {string[]} [headers] - (可选) 表格的表头字符串数组。如果提供，将渲染表头。
-   * @returns {Promise<string | Buffer>}
-   * 如果成功，返回包含PNG图片的 Buffer。如果输入的数据列表为空，则返回一个提示性字符串。
+   * @description 构建并渲染一个包含标题、统计信息和数据表格的 HTML 卡片为图片。
+   * @param data - 包含渲染所需全部信息的对象。
+   * @param headers - (可选) 表格的表头字符串数组。
+   * @returns 成功时返回包含 PNG 图片的 Buffer，若列表为空则返回提示字符串。
    */
   async renderList(data, headers) {
     const { title, time, list } = data;
     if (!list?.length) return "暂无数据可供渲染";
-    let totalValueForPercent = 0;
-    const countHeaderIndex = headers?.findIndex((h3) => ["总计发言", "条数", "次数", "数量"].includes(h3));
-    if (countHeaderIndex > -1) {
-      totalValueForPercent = list.reduce((sum, row) => sum + (Number(row[countHeaderIndex]) || 0), 0);
-    }
-    const totalCount = data.total || totalValueForPercent;
-    const tableHeadHtml = headers?.length > 0 ? `<thead><tr><th class="rank-cell">#</th>${headers.map((h3, i) => {
-      const firstCell = list[0]?.[i];
-      const isRightAlign = typeof firstCell === "number" || firstCell instanceof Date || h3.includes("占比");
-      const alignClass = isRightAlign ? "header-right-align" : "name-header";
-      return `<th class="${alignClass}">${h3}</th>`;
-    }).join("")}</tr></thead>` : "";
+    const countHeaderIndex = headers?.findIndex((h4) => ["总计发言", "条数", "次数", "数量"].includes(h4)) ?? -1;
+    const totalValue = countHeaderIndex > -1 ? list.reduce((sum, row) => sum + (Number(row[countHeaderIndex]) || 0), 0) : 0;
+    const totalCount = data.total || totalValue;
+    const renderCell = /* @__PURE__ */ __name((cell, i) => {
+      const headerText = headers?.[i] || "";
+      if (headerText.includes("占比")) {
+        const percentValue = parseFloat(String(cell).replace("%", ""));
+        return `<td class="percent-cell"><div class="percent-bar" style="width: ${percentValue}%;"></div><span class="percent-text">${cell}</span></td>`;
+      }
+      if (cell instanceof Date) return `<td class="date-cell">${this.formatDate(cell)}</td>`;
+      if (typeof cell === "number") return `<td class="count-cell">${cell.toLocaleString()}</td>`;
+      return `<td class="name-cell">${String(cell)}</td>`;
+    }, "renderCell");
+    const tableHeadHtml = headers?.length ? `<thead><tr><th class="rank-cell">#</th>${headers.map((h4) => `<th class="${typeof list[0]?.[headers.indexOf(h4)] === "string" ? "name-header" : "header-right-align"}">${h4}</th>`).join("")}</tr></thead>` : "";
     const tableRowsHtml = list.map((row, index) => {
       const rank = index + 1;
       const rankClass = rank === 1 ? "rank-gold" : rank === 2 ? "rank-silver" : rank === 3 ? "rank-bronze" : "";
-      const rankCell = `<td class="rank-cell ${rankClass}">${rank}</td>`;
-      const dataCells = row.map((cell, i) => {
-        let className = "";
-        let content;
-        const headerText = headers?.[i] || "";
-        if (headerText.includes("占比")) {
-          className = "percent-cell";
-          const percentValue = parseFloat(String(cell).replace("%", ""));
-          content = `<div class="percent-bar" style="width: ${percentValue}%;"></div><span class="percent-text">${cell}</span>`;
-        } else if (cell instanceof Date) {
-          className = "date-cell";
-          content = this.formatDate(cell);
-        } else if (typeof cell === "number") {
-          className = "count-cell";
-          content = cell.toLocaleString();
-        } else {
-          className = "name-cell";
-          content = String(cell);
-        }
-        return `<td class="${className}">${content}</td>`;
-      }).join("");
-      return `<tr>${rankCell}${dataCells}</tr>`;
+      return `<tr><td class="rank-cell ${rankClass}">${rank}</td>${row.map(renderCell).join("")}</tr>`;
     }).join("");
-    const cardHtml = `
-      <div class="container">
-        <div class="header">
-          <table class="header-table">
-            <tr>
-              <td class="header-table-left">
-                <div class="stat-chip">总计: <span>${typeof totalCount === "number" ? totalCount.toLocaleString() : totalCount}</span></div>
-              </td>
-              <td class="header-table-center">
-                <h1 class="title-text">${title}</h1>
-              </td>
-              <td class="header-table-right">
-                <div class="time-label">${time.toLocaleString("zh-CN", { hour12: false }).replace(/\//g, "-")}</div>
-              </td>
-            </tr>
-          </table>
-        </div>
-        <div class="table-container">
-          <table class="main-table">${tableHeadHtml}<tbody>${tableRowsHtml}</tbody></table>
-        </div>
-      </div>
-    `;
+    const cardHtml = `<div class="container"><div class="header"><table class="header-table"><tr><td class="header-table-left"><div class="stat-chip">总计: <span>${typeof totalCount === "number" ? totalCount.toLocaleString() : totalCount}</span></div></td><td class="header-table-center"><h1 class="title-text">${title}</h1></td><td class="header-table-right"><div class="time-label">${time.toLocaleString("zh-CN", { hour12: false }).replace(/\//g, "-")}</div></td></tr></table></div><div class="table-container"><table class="main-table">${tableHeadHtml}<tbody>${tableRowsHtml}</tbody></table></div></div>`;
     return this.htmlToImage(cardHtml);
   }
 };
@@ -556,298 +292,139 @@ var Renderer = class {
 // src/Stat.ts
 var Stat = class {
   /**
-   * @constructor
-   * @param {Context} ctx - Koishi 的插件上下文。
-   * @param {Config} config - 插件的配置对象。
+   * @param ctx - Koishi 的插件上下文。
+   * @param config - 插件的配置对象。
    */
   constructor(ctx, config) {
     this.ctx = ctx;
     this.config = config;
     this.renderer = new Renderer(ctx);
-    this.setupCleanupTask();
-  }
-  static {
-    __name(this, "Stat");
-  }
-  renderer;
-  /**
-   * @private
-   * @method setupCleanupTask
-   * @description 设置一个定时清理任务。
-   * 此任务会根据配置中的 `rankRetentionDays` 定期删除过期的发言排行数据，以防止数据库膨胀。
-   */
-  setupCleanupTask() {
     if (this.config.rankRetentionDays > 0) {
       this.ctx.cron("0 0 * * *", async () => {
-        try {
-          const cutoffDate = new Date(Date.now() - this.config.rankRetentionDays * import_koishi3.Time.day);
-          await this.ctx.database.remove("analyse_rank", { timestamp: { $lt: cutoffDate } });
-        } catch (error) {
-          this.ctx.logger.error("清理发言排行历史记录出错:", error);
-        }
+        const cutoffDate = new Date(Date.now() - this.config.rankRetentionDays * import_koishi3.Time.day);
+        await this.ctx.database.remove("analyse_rank", { timestamp: { $lt: cutoffDate } }).catch((e) => this.ctx.logger.error("清理发言排行历史记录失败:", e));
       });
     }
   }
+  static {
+    __name(this, "Stat");
+  }
+  renderer;
   /**
-   * @public
-   * @method registerCommands
-   * @description 根据插件配置，动态地将 `.cmd`, `.msg`, `.rank` 子命令注册到主 `analyse` 命令下。
-   * @param {Command} analyse - 主 `analyse` 命令实例。
+   * @public @method registerCommands
+   * @description 根据配置，动态地将 `.cmd`, `.msg`, `.rank` 子命令注册到主 `analyse` 命令下。
+   * @param analyse - 主 `analyse` 命令实例。
    */
   registerCommands(analyse) {
-    if (this.config.enableCmdStat) {
-      analyse.subcommand(".cmd", "命令使用统计").option("user", "-u <user:string> 指定用户").option("guild", "-g <guildId:string> 指定群组").option("all", "-a 展示全局统计").action(async ({ session, options }) => {
-        const scope = this.parseQueryScope(session, options);
-        if (scope.error) return scope.error;
-        try {
-          const stats = await this.getCommandStats(scope.guildId, scope.userId);
-          if (typeof stats === "string") return stats;
-          const title = await this.generateTitle(scope.guildId, scope.userId, { main: "命令" });
-          const renderData = { title, time: /* @__PURE__ */ new Date(), total: stats.total, list: stats.list };
-          const result = await this.renderer.renderList(renderData, ["命令", "次数", "最后使用"]);
-          return Buffer.isBuffer(result) ? import_koishi3.Element.image(result, "image/png") : result;
-        } catch (error) {
-          this.ctx.logger.error("渲染命令统计图片失败:", error);
-          return "渲染命令统计图片失败";
-        }
-      });
-    }
-    if (this.config.enableMsgStat) {
-      analyse.subcommand(".msg", "消息发送统计").option("user", "-u <user:string> 指定用户").option("guild", "-g <guildId:string> 指定群组").option("type", "-t <type:string> 指定类型").option("all", "-a 展示全局统计").action(async ({ session, options }) => {
-        const scope = this.parseQueryScope(session, options);
+    const createHandler = /* @__PURE__ */ __name((handler) => {
+      return async ({ session, options }) => {
+        const scope = await this.parseQueryScope(session, options);
         if (scope.error) return scope.error;
         try {
-          if (options.type) {
-            const stats = await this.getMessageStatsByType(options.type, scope.guildId, scope.userId);
-            if (typeof stats === "string") return stats;
-            const title = await this.generateTitle(scope.guildId, scope.userId, { main: "消息", subtype: options.type });
-            const renderData = { title, time: /* @__PURE__ */ new Date(), total: stats.total, list: stats.list };
-            const result = await this.renderer.renderList(renderData, ["用户", "条数", "最后发言"]);
-            return Buffer.isBuffer(result) ? import_koishi3.Element.image(result, "image/png") : result;
-          } else {
-            const stats = await this.getUserMessageStats(scope.guildId, scope.userId);
-            if (typeof stats === "string") return stats;
-            const title = await this.generateTitle(scope.guildId, scope.userId, { main: "消息" });
-            const renderData = { title, time: /* @__PURE__ */ new Date(), total: stats.total, list: stats.list };
-            const result = await this.renderer.renderList(renderData, ["用户", "总计发言", "最后发言"]);
-            return Buffer.isBuffer(result) ? import_koishi3.Element.image(result, "image/png") : result;
-          }
-        } catch (error) {
-          this.ctx.logger.error("渲染消息统计图片失败:", error);
-          return "渲染消息统计图片失败";
-        }
-      });
-    }
-    if (this.config.enableRankStat) {
-      analyse.subcommand(".rank", "用户发言排行").option("guild", "-g <guildId:string> 指定群组").option("type", "-t <type:string> 指定类型").option("hours", "-h <hours:number> 指定时长", { fallback: 24 }).option("all", "-a 展示全局统计").action(async ({ session, options }) => {
-        const guildId = options.all ? void 0 : options.guild || session.guildId;
-        if (!guildId && !options.all) return "请提供查询范围";
-        try {
-          const stats = await this.getActiveUserStats(options.hours, guildId, options.type);
-          if (typeof stats === "string") return stats;
-          const listWithPercentage = stats.list.map((row) => [
-            ...row,
-            stats.total > 0 ? `${(row[1] / stats.total * 100).toFixed(2)}%` : "0.00%"
-          ]);
-          const title = await this.generateTitle(guildId, void 0, { main: "排行", timeRange: options.hours, subtype: options.type });
-          const renderData = { title, time: /* @__PURE__ */ new Date(), total: stats.total, list: listWithPercentage };
-          const result = await this.renderer.renderList(renderData, ["用户", "总计发言", "占比"]);
-          return Buffer.isBuffer(result) ? import_koishi3.Element.image(result, "image/png") : result;
+          const result = await handler(scope, options);
+          return Buffer.isBuffer(result) ? import_koishi3.h.image(result, "image/png") : result;
         } catch (error) {
-          this.ctx.logger.error("渲染发言排行图片失败:", error);
-          return "渲染发言排行图片失败";
+          this.ctx.logger.error("渲染统计图片失败:", error);
+          return "渲染统计图片失败";
         }
-      });
-    }
-  }
-  /**
-   * @private
-   * @method parseQueryScope
-   * @description 解析命令的选项，将其转换为统一的查询范围对象（userId 和 guildId）。
-   * @param {Session} session - 当前会话对象。
-   * @param {QueryScopeOptions} options - 命令传入的选项。
-   * @returns {QueryScopeResult} 包含 userId、guildId 或 error 信息的查询范围对象。
-   */
-  parseQueryScope(session, options) {
-    let userId, guildId;
-    if (options.user) {
-      const atElements = import_koishi3.h.select(options.user, "at");
-      if (atElements.length > 0) {
-        userId = atElements[0].attrs.id;
+      };
+    }, "createHandler");
+    if (this.config.enableCmdStat) analyse.subcommand(".cmd", "命令使用统计").option("user", "-u <user:string> 指定用户").option("guild", "-g <guildId:string> 指定群组").option("all", "-a 全局").action(createHandler(async (scope) => {
+      const stats = await this.ctx.database.select("analyse_cmd").where({ uid: { $in: scope.uids } }).groupBy("command", { count: /* @__PURE__ */ __name((row) => import_koishi3.$.sum(row.count), "count"), lastUsed: /* @__PURE__ */ __name((row) => import_koishi3.$.max(row.timestamp), "lastUsed") }).orderBy("count", "desc").execute();
+      if (stats.length === 0) return "暂无匹配指令统计数据";
+      const total = stats.reduce((sum, record) => sum + record.count, 0);
+      const list = stats.map((item) => [item.command, item.count, item.lastUsed]);
+      const title = await this.generateTitle(scope.scopeDesc, { main: "命令使用" });
+      return this.renderer.renderList({ title, time: /* @__PURE__ */ new Date(), total, list }, ["命令", "次数", "最后使用"]);
+    }));
+    if (this.config.enableMsgStat) analyse.subcommand(".msg", "消息发送统计").option("user", "-u <user:string> 指定用户").option("guild", "-g <guildId:string> 指定群组").option("type", "-t <type:string> 指定类型").option("all", "-a 全局").action(createHandler(async (scope, options) => {
+      const type = options.type;
+      if (type) {
+        const users = await this.ctx.database.get("analyse_user", { uid: { $in: scope.uids } }, ["uid", "userName"]);
+        const userNameMap = new Map(users.map((u) => [u.uid, u.userName]));
+        const stats = await this.ctx.database.select("analyse_msg").where({ uid: { $in: scope.uids }, type }).groupBy("uid", { count: /* @__PURE__ */ __name((row) => import_koishi3.$.sum(row.count), "count"), lastUsed: /* @__PURE__ */ __name((row) => import_koishi3.$.max(row.timestamp), "lastUsed") }).orderBy("count", "desc").execute();
+        if (stats.length === 0) return `暂无“${type}”类型消息数据`;
+        const total = stats.reduce((sum, r) => sum + r.count, 0);
+        const list = stats.map((item) => [userNameMap.get(item.uid) || `UID ${item.uid}`, item.count, item.lastUsed]);
+        const title = await this.generateTitle(scope.scopeDesc, { main: "消息", subtype: type });
+        return this.renderer.renderList({ title, time: /* @__PURE__ */ new Date(), total, list }, ["用户", "条数", "最后发言"]);
       } else {
-        userId = options.user.trim();
+        const users = await this.ctx.database.get("analyse_user", { uid: { $in: scope.uids } }, ["uid", "userName"]);
+        const userNameMap = new Map(users.map((u) => [u.uid, u.userName]));
+        const stats = await this.ctx.database.select("analyse_msg").where({ uid: { $in: scope.uids } }).groupBy("uid", { count: /* @__PURE__ */ __name((row) => import_koishi3.$.sum(row.count), "count"), lastUsed: /* @__PURE__ */ __name((row) => import_koishi3.$.max(row.timestamp), "lastUsed") }).orderBy("count", "desc").execute();
+        if (stats.length === 0) return "暂无消息数据";
+        const total = stats.reduce((sum, r) => sum + r.count, 0);
+        const list = stats.map((item) => [userNameMap.get(item.uid) || `UID ${item.uid}`, item.count, item.lastUsed]);
+        const title = await this.generateTitle(scope.scopeDesc, { main: "消息发送" });
+        return this.renderer.renderList({ title, time: /* @__PURE__ */ new Date(), total, list }, ["用户", "总计发言", "最后发言"]);
       }
-    }
-    if (options.guild) guildId = options.guild;
-    if (options.all) return { userId, guildId: void 0 };
-    if (!userId && !guildId) {
-      if (session.guildId) return { guildId: session.guildId };
-      return { error: "请提供查询范围" };
-    }
-    return { userId, guildId };
+    }));
+    if (this.config.enableRankStat) analyse.subcommand(".rank", "用户发言排行").option("guild", "-g <guildId:string> 指定群组").option("type", "-t <type:string> 指定类型").option("hours", "-h <hours:number> 指定时长", { fallback: 24 }).option("all", "-a 全局").action(async ({ session, options }) => {
+      const guildId = options.all ? void 0 : options.guild || session.guildId;
+      if (!guildId && !options.all) return "请指定群组或查询全局";
+      try {
+        const { hours, type } = options;
+        const since = new Date(Date.now() - hours * import_koishi3.Time.hour);
+        const baseQuery = { timestamp: { $gte: since } };
+        if (type) baseQuery.type = type;
+        const uidsInScope = guildId ? (await this.ctx.database.get("analyse_user", { channelId: guildId }, ["uid"])).map((u) => u.uid) : void 0;
+        if (guildId && uidsInScope.length === 0) return "暂无指定时段内发言记录";
+        if (uidsInScope) baseQuery.uid = { $in: uidsInScope };
+        const rankStats = await this.ctx.database.select("analyse_rank").where(baseQuery).groupBy("uid", { count: /* @__PURE__ */ __name((row) => import_koishi3.$.sum(row.count), "count") }).orderBy("count", "desc").limit(100).execute();
+        if (rankStats.length === 0) return "暂无指定时段内发言记录";
+        const uids = rankStats.map((s) => s.uid);
+        const users = await this.ctx.database.get("analyse_user", { uid: { $in: uids } }, ["uid", "userName"]);
+        const userNameMap = new Map(users.map((u) => [u.uid, u.userName]));
+        const total = rankStats.reduce((sum, record) => sum + record.count, 0);
+        const list = rankStats.map((item) => [userNameMap.get(item.uid) || `UID ${item.uid}`, item.count]);
+        const listWithPercentage = list.map((row) => [...row, total > 0 ? `${(row[1] / total * 100).toFixed(2)}%` : "0.00%"]);
+        const title = await this.generateTitle({ guildId }, { main: "发言排行", timeRange: hours, subtype: type });
+        const result = await this.renderer.renderList({ title, time: /* @__PURE__ */ new Date(), total, list: listWithPercentage }, ["用户", "总计发言", "占比"]);
+        return Buffer.isBuffer(result) ? import_koishi3.h.image(result, "image/png") : result;
+      } catch (error) {
+        this.ctx.logger.error("渲染发言排行图片失败:", error);
+        return "渲染发言排行图片失败";
+      }
+    });
   }
   /**
-   * @private
-   * @async
-   * @method getUidsInScope
-   * @description 根据查询范围（guildId, userId）获取匹配用户的 UID 列表。
-   * @param {string} [guildId] - (可选) 群组 ID。
-   * @param {string} [userId] - (可选) 用户 ID。
-   * @returns {Promise<{ uids?: number[], error?: string }>} 包含 UID 数组或错误信息的对象。
+   * @private @method parseQueryScope
+   * @description 解析命令选项，转换为包含 UIDs 和描述性信息的统一查询范围对象。
+   * @param session - 当前会话对象。
+   * @param options - 命令选项。
+   * @returns 包含 uids、错误或范围描述的查询范围对象。
    */
-  async getUidsInScope(guildId, userId) {
+  async parseQueryScope(session, options) {
+    const scopeDesc = { guildId: options.guild, userId: void 0 };
+    if (options.user) scopeDesc.userId = import_koishi3.h.select(options.user, "at")[0]?.attrs.id ?? options.user.trim();
+    if (!options.all && !scopeDesc.guildId && !scopeDesc.userId) scopeDesc.guildId = session.guildId;
+    if (!options.all && !scopeDesc.guildId) return { error: "请指定群组或查询全局", scopeDesc };
     const query = {};
-    if (guildId) query.channelId = guildId;
-    if (userId) query.userId = userId;
+    if (scopeDesc.guildId) query.channelId = scopeDesc.guildId;
+    if (scopeDesc.userId) query.userId = scopeDesc.userId;
     const users = await this.ctx.database.get("analyse_user", query, ["uid"]);
-    if (users.length === 0) return { error: "暂无统计数据" };
-    return { uids: users.map((u) => u.uid) };
+    if (users.length === 0) return { error: "在指定范围内未找到任何记录", scopeDesc };
+    return { uids: users.map((u) => u.uid), scopeDesc };
   }
   /**
-   * @private
-   * @async
-   * @method generateTitle
-   * @description 通用的标题生成器。根据查询参数和类型选项动态生成易于理解的图片标题。
-   * @param {string} [guildId] - (可选) 查询的群组 ID。
-   * @param {string} [userId] - (可选) 查询的用户 ID。
-   * @param {object} options - 标题的配置选项。
-   * @param {'命令' | '消息' | '排行'} options.main - 标题主类型。
-   * @param {string} [options.subtype] - (可选) 消息类型的子类型。
-   * @param {number} [options.timeRange] - (可选) 排行的时间范围（小时）。
-   * @returns {Promise<string>} 生成的标题字符串。
+   * @private @method generateTitle
+   * @description 根据查询范围和类型动态生成易于理解的图片标题。
+   * @returns 生成的标题字符串。
    */
-  async generateTitle(guildId, userId, options) {
+  async generateTitle(scopeDesc, options) {
     let scopeText = "全局";
-    if (userId && guildId) {
-      const user = await this.ctx.database.get("analyse_user", { channelId: guildId, userId }, ["userName"]);
-      const guild = await this.ctx.database.get("analyse_user", { channelId: guildId }, ["channelName"]);
-      scopeText = `${user[0]?.userName || userId} 在 ${guild[0]?.channelName || guildId}`;
-    } else if (userId) {
-      const user = await this.ctx.database.get("analyse_user", { userId }, ["userName"]);
-      scopeText = `${user[0]?.userName || userId}的全局`;
-    } else if (guildId) {
-      const guild = await this.ctx.database.get("analyse_user", { channelId: guildId }, ["channelName"]);
-      scopeText = guild[0]?.channelName || guildId;
+    if (scopeDesc.guildId) {
+      const [guild] = await this.ctx.database.get("analyse_user", { channelId: scopeDesc.guildId }, ["channelName"]);
+      scopeText = guild?.channelName || scopeDesc.guildId;
     }
-    if (options.main === "排行") {
-      const typeText = options.subtype ? `“${options.subtype}”` : "";
-      return `${scopeText}${options.timeRange}小时${typeText}消息排行`;
-    }
-    if (options.main === "消息" && options.subtype) return `${scopeText}“${options.subtype}”消息统计`;
-    return `${scopeText}${options.main}统计`;
-  }
-  /**
-   * @private
-   * @async
-   * @method getCommandStats
-   * @description 从数据库中获取并聚合命令使用统计数据。
-   * @param {string} [guildId] - (可选) 若提供，则将范围限制在此群组。
-   * @param {string} [userId] - (可选) 若提供，则将范围限制在此用户。
-   * @returns {Promise<{ list: RenderListItem[], total: number } | string>} 返回一个包含列表和总数的对象，或在无数据时返回提示字符串。
-   */
-  async getCommandStats(guildId, userId) {
-    const { uids, error } = await this.getUidsInScope(guildId, userId);
-    if (error) return error;
-    const stats = await this.ctx.database.select("analyse_cmd").where({ uid: { $in: uids } }).groupBy("command", { count: /* @__PURE__ */ __name((row) => import_koishi3.$.sum(row.count), "count"), lastUsed: /* @__PURE__ */ __name((row) => import_koishi3.$.max(row.timestamp), "lastUsed") }).orderBy("count", "desc").execute();
-    if (stats.length === 0) return "暂无统计数据";
-    const total = stats.reduce((sum, record) => sum + record.count, 0);
-    const list = stats.map((item) => [item.command, item.count, item.lastUsed]);
-    return { list, total };
-  }
-  /**
-   * @private
-   * @async
-   * @method getUserMessageStats
-   * @description 从数据库中获取并聚合每个用户的消息统计数据。
-   * @param {string} [guildId] - (可选) 若提供，则将范围限制在此群组。
-   * @param {string} [userId] - (可选) 若提供，则将范围限制在此用户。
-   * @returns {Promise<{ list: RenderListItem[], total: number } | string>} 返回一个包含列表和总数的对象，或在无数据时返回提示字符串。
-   */
-  async getUserMessageStats(guildId, userId) {
-    const query = {};
-    if (guildId) query.channelId = guildId;
-    if (userId) query.userId = userId;
-    const users = await this.ctx.database.get("analyse_user", query, ["uid", "userName"]);
-    if (users.length === 0) return "暂无统计数据";
-    const uids = users.map((u) => u.uid);
-    const userNameMap = new Map(users.map((u) => [u.uid, u.userName]));
-    const stats = await this.ctx.database.select("analyse_msg").where({ uid: { $in: uids } }).groupBy("uid", {
-      count: /* @__PURE__ */ __name((row) => import_koishi3.$.sum(row.count), "count"),
-      lastUsed: /* @__PURE__ */ __name((row) => import_koishi3.$.max(row.timestamp), "lastUsed")
-    }).orderBy("count", "desc").execute();
-    if (stats.length === 0) return "暂无统计数据";
-    const total = stats.reduce((sum, record) => sum + record.count, 0);
-    const list = stats.map((item) => [userNameMap.get(item.uid) || `UID ${item.uid}`, item.count, item.lastUsed]);
-    return { list, total };
-  }
-  /**
-   * @private
-   * @async
-   * @method getMessageStatsByType
-   * @description 按指定消息类型，从数据库中获取并聚合用户排行数据。
-   * @param {string} type - 要查询的消息类型。
-   * @param {string} [guildId] - (可选) 若提供，则将范围限制在此群组。
-   * @param {string} [userId] - (可选) 若提供，则将范围限制在此用户。
-   * @returns {Promise<{ list: RenderListItem[], total: number } | string>} 返回一个包含列表和总数的对象，或在无数据时返回提示字符串。
-   */
-  async getMessageStatsByType(type, guildId, userId) {
-    const query = {};
-    if (guildId) query.channelId = guildId;
-    if (userId) query.userId = userId;
-    const users = await this.ctx.database.get("analyse_user", query, ["uid", "userName"]);
-    if (users.length === 0) return "暂无统计数据";
-    const uids = users.map((u) => u.uid);
-    const userNameMap = new Map(users.map((u) => [u.uid, u.userName]));
-    const stats = await this.ctx.database.select("analyse_msg").where({ uid: { $in: uids }, type }).groupBy("uid", { count: /* @__PURE__ */ __name((row) => import_koishi3.$.sum(row.count), "count"), lastUsed: /* @__PURE__ */ __name((row) => import_koishi3.$.max(row.timestamp), "lastUsed") }).orderBy("count", "desc").execute();
-    if (stats.length === 0) return `暂无统计数据`;
-    const total = stats.reduce((sum, record) => sum + record.count, 0);
-    const list = stats.map((item) => [userNameMap.get(item.uid) || `UID ${item.uid}`, item.count, item.lastUsed]);
-    return { list, total };
-  }
-  /**
-   * @private
-   * @async
-   * @method getActiveUserStats
-   * @description 从数据库中获取并聚合指定时间范围内的活跃用户排行数据。
-   * @param {number} hours - 查询过去的小时数。
-   * @param {string} [guildId] - (可选) 要查询的群组 ID。若不提供，则进行全局排行。
-   * @param {string} [type] - (可选) 要筛选的消息类型。
-   * @returns {Promise<{ list: RenderListItem[], total: number } | string>} 返回一个包含列表和总数的对象，或在无数据时返回提示字符串。
-   */
-  async getActiveUserStats(hours, guildId, type) {
-    const since = new Date(Date.now() - hours * 3600 * 1e3);
-    const baseQuery = { timestamp: { $gte: since } };
-    if (type) baseQuery.type = type;
-    if (guildId) {
-      const usersInGuild = await this.ctx.database.get("analyse_user", { channelId: guildId }, ["uid", "userName"]);
-      if (usersInGuild.length === 0) return "暂无统计数据";
-      const uids = usersInGuild.map((u) => u.uid);
-      const userNameMap = new Map(usersInGuild.map((u) => [u.uid, u.userName]));
-      const query = { ...baseQuery, uid: { $in: uids } };
-      const stats = await this.ctx.database.select("analyse_rank").where(query).groupBy("uid", { count: /* @__PURE__ */ __name((row) => import_koishi3.$.sum(row.count), "count") }).orderBy("count", "desc").limit(100).execute();
-      if (stats.length === 0) return "暂无统计数据";
-      const total = stats.reduce((sum, record) => sum + record.count, 0);
-      const list = stats.map((item) => [userNameMap.get(item.uid) || `UID ${item.uid}`, item.count]);
-      return { list, total };
-    } else {
-      const msgStats = await this.ctx.database.select("analyse_rank").where(baseQuery).project(["uid", "count"]).execute();
-      if (msgStats.length === 0) return "暂无统计数据";
-      const allUsers = await this.ctx.database.get("analyse_user", {}, ["uid", "userId", "userName"]);
-      const uidToUserMap = new Map(allUsers.map((u) => [u.uid, { userId: u.userId, userName: u.userName }]));
-      const userCounts = /* @__PURE__ */ new Map();
-      for (const msg of msgStats) {
-        const userInfo = uidToUserMap.get(msg.uid);
-        if (userInfo) {
-          const existing = userCounts.get(userInfo.userId);
-          userCounts.set(userInfo.userId, { count: (existing?.count || 0) + msg.count, name: userInfo.userName });
-        }
-      }
-      if (userCounts.size === 0) return "暂无统计数据";
-      const grandTotal = Array.from(userCounts.values()).reduce((sum, data) => sum + data.count, 0);
-      const sortedUsers = Array.from(userCounts.entries()).sort(([, a], [, b]) => b.count - a.count).slice(0, 100);
-      const list = sortedUsers.map(([userId, data]) => [data.name || userId, data.count]);
-      return { list, total: grandTotal };
+    if (scopeDesc.userId) {
+      const [user] = await this.ctx.database.get("analyse_user", { userId: scopeDesc.userId }, ["userName"]);
+      const userName = user?.userName || scopeDesc.userId;
+      scopeText = scopeDesc.guildId ? `${userName} 在 ${scopeText}` : `${userName} 的全局`;
     }
+    const typeText = options.subtype ? `“${options.subtype}”` : "";
+    if (options.main.includes("排行")) return `${scopeText}${options.timeRange}小时${typeText}消息排行`;
+    return `${scopeText}${typeText}${options.main}统计`;
   }
 };
 
@@ -855,65 +432,50 @@ var Stat = class {
 var import_koishi4 = require("koishi");
 var WhoAt = class {
   /**
-   * WhoAt 类的构造函数。
-   * @param {Context} ctx - Koishi 的插件上下文，用于访问框架核心功能和数据库等服务。
-   * @param {Config} config - 插件的配置对象，包含如记录保留天数等设置。
+   * @param ctx - Koishi 的插件上下文。
+   * @param config - 插件的配置对象。
    */
   constructor(ctx, config) {
     this.ctx = ctx;
     this.config = config;
-    this.setupCleanupTask();
-  }
-  static {
-    __name(this, "WhoAt");
-  }
-  /**
-   * @private
-   * @method setupCleanupTask
-   * @description 设置一个定时清理任务。
-   * 此任务会根据配置中的 `atRetentionDays` 定期删除过期的@记录，以防止数据库膨胀。
-   */
-  setupCleanupTask() {
     if (this.config.atRetentionDays > 0) {
       this.ctx.cron("0 0 * * *", async () => {
-        try {
-          const cutoffDate = new Date(Date.now() - this.config.atRetentionDays * import_koishi4.Time.day);
-          await this.ctx.database.remove("analyse_at", { timestamp: { $lt: cutoffDate } });
-        } catch (error) {
-          this.ctx.logger.error("清理 @ 历史记录出错:", error);
-        }
+        const cutoffDate = new Date(Date.now() - this.config.atRetentionDays * import_koishi4.Time.day);
+        await this.ctx.database.remove("analyse_at", { timestamp: { $lt: cutoffDate } }).catch((e) => this.ctx.logger.error("清理 @ 历史记录失败:", e));
       });
     }
   }
+  static {
+    __name(this, "WhoAt");
+  }
   /**
-   * @public
-   * @method registerCommand
+   * @public @method registerCommand
    * @description 在主 `analyse` 命令下注册 `whoatme` 子命令。
-   * @param {Command} analyse - 用户传入的主 `analyse` 命令实例，`whoatme` 将作为其子命令。
+   * @param analyse - 主 `analyse` 命令实例。
    */
   registerCommand(analyse) {
-    analyse.subcommand("whoatme", "谁 @ 我").action(async ({ session }) => {
+    analyse.subcommand(".whoatme", "谁@我").action(async ({ session }) => {
       if (!session.userId) return "无法获取用户信息";
       try {
-        const records = await this.ctx.database.select("analyse_at").where({ target: session.userId }).orderBy("timestamp", "asc").limit(100).execute();
-        if (records.length === 0) return "暂无 @ 记录";
+        const records = await this.ctx.database.get("analyse_at", { target: session.userId }, {
+          sort: { timestamp: "asc" },
+          limit: 100
+        });
+        if (records.length === 0) return "最近没有人提及您";
         const uids = [...new Set(records.map((r) => r.uid))];
-        const users = await this.ctx.database.select("analyse_user", { uid: { $in: uids } }).project(["uid", "userName", "userId"]).execute();
+        const users = await this.ctx.database.get("analyse_user", { uid: { $in: uids } }, ["uid", "userName", "userId"]);
         const userInfoMap = new Map(users.map((u) => [u.uid, { name: u.userName, id: u.userId }]));
         const messageElements = records.map((record) => {
-          const senderInfo = userInfoMap.get(record.uid);
-          const userId = senderInfo.id;
-          const userName = senderInfo.name || userId;
-          const authorElement = (0, import_koishi4.h)("author", { userId, name: userName });
-          const contentElement = import_koishi4.h.text(record.content);
-          return (0, import_koishi4.h)("message", {}, [authorElement, contentElement]);
+          const senderInfo = userInfoMap.get(record.uid) ?? { name: "未知用户", id: "0" };
+          return (0, import_koishi4.h)("message", {}, [
+            (0, import_koishi4.h)("author", { userId: senderInfo.id, nickname: senderInfo.name }),
+            import_koishi4.h.text(record.content)
+          ]);
         });
-        if (messageElements.length === 0) return "暂无有效 @ 记录";
-        const forwardMessage = (0, import_koishi4.h)("message", { forward: true }, messageElements);
-        await session.send(forwardMessage);
+        return (0, import_koishi4.h)("message", { forward: true }, messageElements);
       } catch (error) {
-        this.ctx.logger.error("查询 @ 记录时失败:", error);
-        return "查询失败，请稍后再试";
+        this.ctx.logger.error("查询 @ 记录失败:", error);
+        return "查询失败，请稍后重试";
       }
     });
   }
@@ -923,14 +485,8 @@ var WhoAt = class {
 var import_koishi5 = require("koishi");
 var fs = __toESM(require("fs/promises"));
 var path = __toESM(require("path"));
-var ALL_TABLES = [
-  "analyse_user",
-  "analyse_cmd",
-  "analyse_msg",
-  "analyse_rank",
-  "analyse_at",
-  "analyse_cache"
-];
+var ALL_TABLES = ["analyse_user", "analyse_cmd", "analyse_msg", "analyse_rank", "analyse_at", "analyse_cache"];
+var BATCH_SIZE = 100;
 var Data = class {
   constructor(ctx) {
     this.ctx = ctx;
@@ -943,8 +499,8 @@ var Data = class {
   /**
    * @public
    * @method registerCommands
-   * @description 在 'analyse.admin' 命令下注册所有数据管理相关的子命令。
-   * @param {Command} analyse - '.admin' 命令实例。
+   * @description 在 `analyse` 命令下注册所有数据管理相关的子命令 (`.backup`, `.restore`, `.clear`, `.list`)。
+   * @param analyse - 主 `analyse` 命令实例。
    */
   registerCommands(analyse) {
     analyse.subcommand(".backup", "备份统计数据", { authority: 4 }).action(async () => {
@@ -963,125 +519,89 @@ var Data = class {
               const userInfo = uidToUserInfoMap.get(record.uid);
               if (!userInfo) return null;
               const { uid, ...restOfRecord } = record;
-              return {
-                userId: userInfo.userId,
-                channelId: userInfo.channelId,
-                ...restOfRecord
-              };
+              return { userId: userInfo.userId, channelId: userInfo.channelId, ...restOfRecord };
             }).filter(Boolean);
           }
           await fs.writeFile(filepath, JSON.stringify(dataToExport, null, 2));
         }
-        return `数据备份成功`;
+        return "数据备份成功";
       } catch (error) {
         this.ctx.logger.error("数据备份失败:", error);
         return "数据备份失败";
       }
     });
     analyse.subcommand(".restore", "恢复统计数据", { authority: 4 }).action(async () => {
-      const BATCH_SIZE = 100;
       try {
         const userTablePath = path.join(this.dataDir, "analyse_user.json");
-        try {
-          const usersToImport = JSON.parse(await fs.readFile(userTablePath, "utf-8"));
-          if (Array.isArray(usersToImport) && usersToImport.length > 0) {
-            for (let i = 0; i < usersToImport.length; i += BATCH_SIZE) {
-              const batch = usersToImport.slice(i, i + BATCH_SIZE);
-              await this.ctx.database.upsert("analyse_user", batch);
-            }
-          }
-        } catch (e) {
-          if (e.code !== "ENOENT") throw e;
-          this.ctx.logger.warn("无用户数据可恢复");
-        }
+        const usersToImport = JSON.parse(await fs.readFile(userTablePath, "utf-8").catch(() => "[]"));
+        if (usersToImport.length) for (let i = 0; i < usersToImport.length; i += BATCH_SIZE) await this.ctx.database.upsert("analyse_user", usersToImport.slice(i, i + BATCH_SIZE));
         const allUsers = await this.ctx.database.get("analyse_user", {});
         const userToUidMap = new Map(allUsers.map((u) => [`${u.channelId}:${u.userId}`, u.uid]));
         for (const tableName of ALL_TABLES.filter((t) => t !== "analyse_user")) {
           const filepath = path.join(this.dataDir, `${tableName}.json`);
-          try {
-            const recordsToImport = JSON.parse(await fs.readFile(filepath, "utf-8"));
-            if (Array.isArray(recordsToImport) && recordsToImport.length > 0) {
-              const recordsWithUid = recordsToImport.map((r) => {
-                const uid = userToUidMap.get(`${r.channelId}:${r.userId}`);
-                if (!uid) return null;
-                const { userId, channelId, ...rest } = r;
-                return { uid, ...rest };
-              }).filter(Boolean);
-              if (recordsWithUid.length > 0) {
-                for (let i = 0; i < recordsWithUid.length; i += BATCH_SIZE) {
-                  const batch = recordsWithUid.slice(i, i + BATCH_SIZE);
-                  await this.ctx.database.upsert(tableName, batch);
-                }
-              }
-            }
-          } catch (e) {
-            if (e.code !== "ENOENT") throw e;
-          }
+          const recordsToImport = JSON.parse(await fs.readFile(filepath, "utf-8").catch(() => "[]"));
+          if (!recordsToImport.length) continue;
+          const recordsWithUid = recordsToImport.map((r) => {
+            const uid = userToUidMap.get(`${r.channelId}:${r.userId}`);
+            if (!uid) return null;
+            const { userId, channelId, ...rest } = r;
+            return { uid, ...rest };
+          }).filter(Boolean);
+          if (recordsWithUid.length > 0) for (let i = 0; i < recordsWithUid.length; i += BATCH_SIZE) await this.ctx.database.upsert(tableName, recordsWithUid.slice(i, i + BATCH_SIZE));
         }
-        return `数据恢复成功`;
+        return "数据恢复成功";
       } catch (error) {
         this.ctx.logger.error("数据恢复失败:", error);
         return "数据恢复失败";
       }
     });
-    analyse.subcommand(".clear", "清理统计数据", { authority: 4 }).option("table", "-t <table:string> 指定表").option("guild", "-g <guildId:string> 指定群组").option("user", "-u <user:string> 指定用户").option("days", "-d <days:number> 指定天数").option("all", "-a 清理全部数据").action(async ({ options }) => {
-      if (!options.table && !options.guild && !options.user && !options.all && !options.days) return "请提供清理条件";
+    analyse.subcommand(".clear", "清理统计数据", { authority: 4 }).option("table", "-t <table:string> 指定表名").option("guild", "-g <guildId:string> 指定群组").option("user", "-u <user:string> 指定用户").option("days", "-d <days:number> 指定天数").option("all", "-a 清理全部数据").action(async ({ options }) => {
+      if (Object.keys(options).length === 0) return "请提供清理条件";
       try {
         if (options.all) {
-          for (const tableName of ALL_TABLES) await this.ctx.database.remove(tableName, {});
+          await Promise.all(ALL_TABLES.map((tableName) => this.ctx.database.remove(tableName, {})));
           return "已清除所有聊天分析数据";
         }
-        let tablesToClear;
-        if (options.table) {
-          if (!ALL_TABLES.includes(options.table)) return `无效表名: ${options.table}`;
-          tablesToClear = [options.table];
-        } else {
-          tablesToClear = ALL_TABLES.filter((t) => t !== "analyse_user");
-        }
-        const queryParts = { query: {}, desc: "" };
+        const tablesToClear = options.table ? [options.table] : ALL_TABLES.filter((t) => t !== "analyse_user");
+        if (options.table && !ALL_TABLES.includes(options.table)) return `无效表名: ${options.table}。`;
+        const query = {};
         const descParts = [];
         if (options.guild || options.user) {
-          const uidsToClear = [];
-          const scopeDesc = [];
+          const userQuery = {};
           if (options.guild) {
-            uidsToClear.push(...(await this.ctx.database.get("analyse_user", { channelId: options.guild })).map((u) => u.uid));
-            scopeDesc.push(`群组 ${options.guild} `);
+            userQuery.channelId = options.guild;
+            descParts.push(`群组 ${options.guild}`);
           }
           if (options.user) {
-            const userId = import_koishi5.Element.select(options.user, "at")[0]?.attrs.id || options.user;
-            uidsToClear.push(...(await this.ctx.database.get("analyse_user", { userId })).map((u) => u.uid));
-            scopeDesc.push(`用户 ${userId} `);
+            userQuery.userId = import_koishi5.Element.select(options.user, "at")[0]?.attrs.id ?? options.user;
+            descParts.push(`用户 ${userQuery.userId}`);
           }
-          const uniqueUids = [...new Set(uidsToClear)];
-          if (uniqueUids.length === 0) return "未找到该用户";
-          queryParts.query.uid = { $in: uniqueUids };
-          descParts.push(scopeDesc.join("、"));
+          const uidsToClear = (await this.ctx.database.get("analyse_user", userQuery)).map((u) => u.uid);
+          if (uidsToClear.length === 0) return "未找到匹配记录";
+          query.uid = { $in: [...new Set(uidsToClear)] };
         }
-        if (options.days && options.days > 0) {
-          queryParts.query.timestamp = { $lt: new Date(Date.now() - options.days * import_koishi5.Time.day) };
+        if (options.days > 0) {
+          query.timestamp = { $lt: new Date(Date.now() - options.days * import_koishi5.Time.day) };
           descParts.push(`超过 ${options.days} 天`);
         }
-        for (const tableName of tablesToClear) {
-          const finalQuery = { ...queryParts.query };
-          if (tableName === "analyse_user" && finalQuery.timestamp) delete finalQuery.timestamp;
-          await this.ctx.database.remove(tableName, finalQuery);
-        }
-        const targetStr = options.table ? `表 ${options.table} ` : "所有表";
-        const conditionStr = descParts.join(" 且 ");
-        const finalDescription = conditionStr ? `${targetStr} 中${conditionStr}的数据` : `${targetStr}的全部统计数据`;
-        return `已成功清理${finalDescription}`;
+        for (const tableName of tablesToClear) await this.ctx.database.remove(tableName, query);
+        const targetStr = options.table ? `表 ${options.table}` : "所有相关表";
+        return `已成功清理${targetStr}中${descParts.join("且")}的数据`;
       } catch (error) {
         this.ctx.logger.error("数据清理失败:", error);
         return "数据清理失败";
       }
     });
-    analyse.subcommand(".list", "列出频道及命令", { authority: 4 }).action(async () => {
-      const allChannelInfo = await this.ctx.database.get("analyse_user", {}, ["channelId", "channelName"]);
+    analyse.subcommand(".list", "列出频道和命令", { authority: 4 }).action(async () => {
+      const [allChannelInfo, commands] = await Promise.all([
+        this.ctx.database.get("analyse_user", {}, ["channelId", "channelName"]),
+        this.ctx.database.select("analyse_cmd").distinct("command").execute()
+      ]);
       const uniqueChannels = [...new Map(allChannelInfo.map((item) => [item.channelId, item])).values()];
-      const channelOutput = uniqueChannels.length > 0 ? "频道列表:\n" + uniqueChannels.map((c) => `[${c.channelId}] ${c.channelName}`).join("\n") : "暂无频道记录";
-      const commands = await this.ctx.database.select("analyse_cmd").distinct("command").execute();
-      const commandOutput = commands.length > 0 ? "命令列表:\n" + commands.map((c) => c.command).join(", ") : "暂无命令记录";
+      const channelOutput = uniqueChannels.length ? "已记录频道列表:\n" + uniqueChannels.map((c) => `[${c.channelId}] ${c.channelName}`).join("\n") : "暂无频道记录";
+      const commandOutput = commands.length ? "已记录命令列表:\n" + commands.join(", ") : "暂无命令记录";
       return `${channelOutput}
+
 ${commandOutput}`;
     });
   }
@@ -1106,7 +626,7 @@ var Config = import_koishi6.Schema.intersect([
   import_koishi6.Schema.object({
     enableListener: import_koishi6.Schema.boolean().default(true).description("启用消息监听"),
     enableData: import_koishi6.Schema.boolean().default(false).description("启用数据管理")
-  }).description("监听配置"),
+  }).description("基础配置"),
   import_koishi6.Schema.object({
     enableCmdStat: import_koishi6.Schema.boolean().default(true).description("启用命令统计"),
     enableMsgStat: import_koishi6.Schema.boolean().default(true).description("启用消息统计"),
@@ -1117,9 +637,9 @@ var Config = import_koishi6.Schema.intersect([
     rankRetentionDays: import_koishi6.Schema.number().min(0).default(31).description("记录保留天数")
   }).description("发言排行配置"),
   import_koishi6.Schema.object({
-    enableWhoAt: import_koishi6.Schema.boolean().default(true).description("启用 @ 记录"),
+    enableWhoAt: import_koishi6.Schema.boolean().default(true).description("启用@记录"),
     atRetentionDays: import_koishi6.Schema.number().min(0).default(7).description("记录保留天数")
-  }).description("@ 记录配置")
+  }).description("@记录配置")
 ]);
 function apply(ctx, config) {
   if (config.enableListener) new Collector(ctx, config);