npm - koishi-plugin-chat-analyse - Versions diffs - 0.3.3 → 0.3.4 - Mend

koishi-plugin-chat-analyse 0.3.3 → 0.3.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/lib/Renderer.d.ts CHANGED Viewed

@@ -1,13 +1,5 @@
 import { Context } from 'koishi';
-/**
- * @typedef {Array<string | number | Date>} RenderListItem
- * @description 定义了统计列表中单行数据的格式，它是一个由字符串、数字或日期组成的元组。
- */
 export type RenderListItem = (string | number | Date)[];
-/**
- * @interface ListRenderData
- * @description 定义了调用渲染器生成列表图片时所需的完整数据结构。
- */
 export interface ListRenderData {
     title: string;
     time: Date;
@@ -16,15 +8,10 @@ export interface ListRenderData {
 }
 /**
  * @class Renderer
- * @description 一个通用的列表渲染器。它使用 Koishi 的 Puppeteer 服务将结构化的 `ListRenderData` 数据
- *              渲染为一张包含精美表格的图片。
+ * @description 通用列表渲染器，使用 Puppeteer 将结构化数据渲染为精美的、类似卡片的表格图片。
  */
 export declare class Renderer {
     private ctx;
-    /**
-     * @constructor
-     * @param {Context} ctx - Koishi 的插件上下文，用于访问 puppeteer 服务。
-     */
     constructor(ctx: Context);
     /**
      * @public
@@ -39,7 +26,7 @@ export declare class Renderer {
     /**
      * @private
      * @method formatDate
-     * @description 智能格式化日期。对于近期的时间，提供更人性化的相对时间描述（如“刚刚”，“x 分钟前”）；对于较早的时间，则显示标准的“年-月-日”格式。
+     * @description 将日期格式化为包含两个单位的相对时间字符串（如“21天14时前”），如果超过一年则显示绝对日期。
      * @param {Date} date - 待格式化的 Date 对象。
      * @returns {string} 格式化后的日期字符串。
      */

package/lib/Stat.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@ import { Renderer } from './Renderer';
 import { Config } from './index';
 /**
  * @class Stat
- * @description 提供统一的统计查询服务。它负责注册查询命令，根据用户输入从数据库中获取数据，并调用渲染器生成统计图表。
+ * @description 提供统一的统计查询服务。负责注册查询命令，从数据库获取数据，并调用渲染器生成图表。
  */
 export declare class Stat {
     private ctx;
@@ -16,11 +16,31 @@ export declare class Stat {
      */
     constructor(ctx: Context, config: Config);
     /**
+     * @public
      * @method registerCommands
      * @description 根据插件配置，动态地将 `.cmd`, `.msg`, `.rank` 子命令注册到主 `analyse` 命令下。
      * @param {Command} analyse - 主 `analyse` 命令实例。
      */
     registerCommands(analyse: Command): void;
+    /**
+     * @private
+     * @method parseQueryScope
+     * @description 解析命令的选项，将其转换为统一的查询范围对象（userId 和 guildId）。
+     * @param {Session} session - 当前会话对象。
+     * @param {QueryScopeOptions} options - 命令传入的选项。
+     * @returns {QueryScopeResult} 包含 userId、guildId 或 error 信息的查询范围对象。
+     */
+    private parseQueryScope;
+    /**
+     * @private
+     * @async
+     * @method getUidsInScope
+     * @description 根据查询范围（guildId, userId）获取匹配用户的 UID 列表。
+     * @param {string} [guildId] - (可选) 群组 ID。
+     * @param {string} [userId] - (可选) 用户 ID。
+     * @returns {Promise<{ uids?: number[], error?: string }>} 包含 UID 数组或错误信息的对象。
+     */
+    private getUidsInScope;
     /**
      * @private
      * @async
@@ -63,17 +83,17 @@ export declare class Stat {
      * @param {string} type - 要查询的消息类型。
      * @param {string} [guildId] - (可选) 若提供，则将范围限制在此群组。
      * @param {string} [userId] - (可选) 若提供，则将范围限制在此用户。
-     * @returns {Promise<{ list: RenderListItem[], total: number } | string>}
+     * @returns {Promise<{ list: RenderListItem[], total: number } | string>} 返回一个包含列表和总数的对象，或在无数据时返回提示字符串。
      */
     private getMessageStatsByType;
     /**
      * @private
      * @async
      * @method getActiveUserStats
-     * @description 从数据库中获取并聚合活跃用户排行数据。
-     * @param {string} guildId - 要查询的群组 ID。
+     * @description 从数据库中获取并聚合指定时间范围内的活跃用户排行数据。
      * @param {number} hours - 查询过去的小时数。
-     * @returns {Promise<{ list: RenderListItem[], total: number } | string>}
+     * @param {string} [guildId] - (可选) 要查询的群组 ID。若不提供，则进行全局排行。
+     * @returns {Promise<{ list: RenderListItem[], total: number } | string>} 返回一个包含列表和总数的对象，或在无数据时返回提示字符串。
      */
     private getActiveUserStats;
 }

package/lib/index.js CHANGED Viewed

@@ -266,10 +266,6 @@ var import_koishi3 = require("koishi");
 // src/Renderer.ts
 var import_koishi2 = require("koishi");
 var Renderer = class {
-  /**
-   * @constructor
-   * @param {Context} ctx - Koishi 的插件上下文，用于访问 puppeteer 服务。
-   */
   constructor(ctx) {
     this.ctx = ctx;
   }
@@ -293,7 +289,7 @@ var Renderer = class {
   /**
    * @private
    * @method formatDate
-   * @description 智能格式化日期。对于近期的时间，提供更人性化的相对时间描述（如“刚刚”，“x 分钟前”）；对于较早的时间，则显示标准的“年-月-日”格式。
+   * @description 将日期格式化为包含两个单位的相对时间字符串（如“21天14时前”），如果超过一年则显示绝对日期。
    * @param {Date} date - 待格式化的 Date 对象。
    * @returns {string} 格式化后的日期字符串。
    */
@@ -301,9 +297,26 @@ var Renderer = class {
     if (!date) return "未知";
     const diff = Date.now() - date.getTime();
     if (diff < import_koishi2.Time.minute) return "刚刚";
-    if (diff < import_koishi2.Time.hour) return `${Math.floor(diff / import_koishi2.Time.minute)} 分钟前`;
-    if (diff < import_koishi2.Time.day) return `${Math.floor(diff / import_koishi2.Time.hour)} 小时前`;
-    return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, "0")}-${String(date.getDate()).padStart(2, "0")}`;
+    if (diff > 365 * import_koishi2.Time.day) {
+      return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, "0")}-${String(date.getDate()).padStart(2, "0")}`;
+    }
+    const timeUnits = [
+      { unit: "月", ms: 30 * import_koishi2.Time.day },
+      { unit: "天", ms: import_koishi2.Time.day },
+      { unit: "时", ms: import_koishi2.Time.hour },
+      { unit: "分", ms: import_koishi2.Time.minute }
+    ];
+    let remainingDiff = diff;
+    const parts = [];
+    for (const { unit, ms } of timeUnits) {
+      if (remainingDiff >= ms) {
+        const value = Math.floor(remainingDiff / ms);
+        parts.push(`${value}${unit}`);
+        remainingDiff %= ms;
+      }
+    }
+    const result = parts.slice(0, 2).join("");
+    return result ? `${result}前` : "刚刚";
   }
   /**
    * @private
@@ -316,63 +329,45 @@ var Renderer = class {
   generateListHtml(data, headers) {
     const { title, time, total, list } = data;
     if (!list?.length) return null;
-    const tableHeadHtml = headers?.length > 0 ? `<thead><tr><th class="rank-cell">排名</th>${headers.map((h2) => `<th>${h2}</th>`).join("")}</tr></thead>` : "";
+    const tableHeadHtml = headers?.length > 0 ? `<thead><tr><th class="rank-cell">排名</th>${headers.map((h2, i) => {
+      const firstCell = list[0]?.[i];
+      let headerClass = "";
+      if (i === 0) headerClass = "column-main-label";
+      if (typeof firstCell === "number" || firstCell instanceof Date) {
+        headerClass += " header-right-align";
+      }
+      return `<th class="${headerClass.trim()}">${h2}</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"><span class="rank-badge ${rankClass}">${rank}</span></td>`;
-      const dataCells = row.map((cell) => {
-        if (cell instanceof Date) return `<td class="data-cell date-cell">${this.formatDate(cell)}</td>`;
-        if (typeof cell === "number") return `<td class="data-cell count-cell">${cell}</td>`;
-        return `<td class="data-cell name-cell">${String(cell)}</td>`;
+      const rankCell = `<td class="rank-cell ${rankClass}">${rank}</td>`;
+      const dataCells = row.map((cell, cellIndex) => {
+        let className = "data-cell";
+        let content;
+        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);
+        }
+        if (cellIndex === 0) className += " column-main-label";
+        return `<td class="${className}">${content}</td>`;
       }).join("");
       return `<tr>${rankCell}${dataCells}</tr>`;
     }).join("");
     const metaInfoHtml = `
       <div class="meta-group">
-        ${total !== void 0 ? `<div class="total-count">总计: ${total}</div>` : ""}
+        ${total !== void 0 ? `<div class="total-count">总计: ${typeof total === "number" ? total.toLocaleString() : total}</div>` : ""}
         <div class="time-label">生成于 ${time.toLocaleString("zh-CN", { hour12: false })}</div>
       </div>
     `;
-    const styles = `
-      :root {
-        --bg-color: #f7f8fa; --card-bg: #ffffff; --text-color: #333; --header-color: #1f2329;
-        --sub-text-color: #646a73; --border-color: #e4e6eb; --accent-color: #4a6ee0;
-        --gold: #ffc327; --silver: #a8b5c1; --bronze: #d69864;
-      }
-      body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif; background: var(--bg-color); margin: 0; padding: 20px; width: 700px; box-sizing: border-box; -webkit-font-smoothing: antialiased; }
-      .container { background: var(--card-bg); border-radius: 12px; box-shadow: 0 6px 16px rgba(0,0,0,0.08); padding: 24px; }
-      .header { display: flex; justify-content: space-between; align-items: flex-start; border-bottom: 1px solid var(--border-color); padding-bottom: 16px; margin-bottom: 16px; }
-      .title-group h1 { font-size: 24px; font-weight: 700; color: var(--header-color); margin: 0; }
-      .meta-group { text-align: right; }
-      .meta-group .total-count { font-size: 22px; font-weight: 700; color: var(--accent-color); }
-      .meta-group .time-label { font-size: 13px; color: var(--sub-text-color); margin-top: 4px; }
-      table { width: 100%; border-collapse: collapse; color: var(--text-color); }
-      th, td { padding: 12px 8px; text-align: left; border-bottom: 1px solid var(--border-color); vertical-align: middle; }
-      th { font-size: 13px; font-weight: 600; color: var(--sub-text-color); }
-      td { font-size: 15px; }
-      tr:last-child td { border-bottom: none; }
-      .rank-cell { width: 50px; text-align: center; }
-      .rank-badge { display: inline-block; width: 24px; height: 24px; line-height: 24px; border-radius: 50%; font-weight: 600; font-size: 14px; color: var(--header-color); background-color: #eef0f3; }
-      .rank-gold, .rank-silver, .rank-bronze { color: #fff; }
-      .rank-gold { background-color: var(--gold); } .rank-silver { background-color: var(--silver); } .rank-bronze { background-color: var(--bronze); }
-      .data-cell { word-break: break-all; }
-      .name-cell { font-weight: 600; color: var(--header-color); }
-      .count-cell { text-align: right; font-weight: 600; color: var(--accent-color); }
-      .date-cell { text-align: right; font-size: 13px; color: var(--sub-text-color); }
-    `;
-    return `
-      <!DOCTYPE html><html lang="zh-CN">
-      <head><meta charset="UTF-8"><title>${title}</title><style>${styles}</style></head>
-      <body>
-        <div class="container">
-          <div class="header">
-            <div class="title-group"><h1>${title}</h1></div>
-            ${metaInfoHtml}
-          </div>
-          <table>${tableHeadHtml}<tbody>${tableRowsHtml}</tbody></table>
-        </div>
-      </body></html>`;
+    const styles = `:root{--bg-color:#f7f8fa;--card-bg:#fff;--text-color:#333;--header-color:#1f2329;--sub-text-color:#646a73;--border-color:#f0f0f0;--accent-color:#4a6ee0;--gold:#ffac33;--silver:#a8b5c1;--bronze:#d69864}body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,'Helvetica Neue',Arial,sans-serif;background:var(--bg-color);margin:0;padding:20px;width:800px;box-sizing:border-box;-webkit-font-smoothing:antialiased}.container{background:var(--card-bg);border-radius:12px;box-shadow:0 8px 24px rgba(0,0,0,.08);padding:20px}.header{display:flex;justify-content:space-between;align-items:flex-start;padding-bottom:12px;margin-bottom:8px}.title-group h1{font-size:22px;font-weight:600;color:var(--header-color);margin:0}.meta-group{text-align:right;white-space:nowrap}.meta-group .total-count{font-size:18px;font-weight:600;color:var(--accent-color)}.meta-group .time-label{font-size:13px;color:var(--sub-text-color);margin-top:4px}table{width:100%;border-collapse:collapse;color:var(--text-color)}th,td{padding:9px 12px;text-align:left;border-bottom:1px solid var(--border-color);vertical-align:middle}thead tr:first-child th{border-top:1px solid var(--border-color)}th{font-size:13px;font-weight:500;color:var(--sub-text-color)}td{font-size:15px}tr:last-child td{border-bottom:none}.header-right-align{text-align:right}.rank-cell{width:45px;text-align:center;font-weight:600;color:var(--sub-text-color);padding-left:0;padding-right:0}.rank-gold{color:var(--gold) !important}.rank-silver{color:var(--silver) !important}.rank-bronze{color:var(--bronze) !important}.column-main-label{width:45%}.data-cell{word-break:break-all}.name-cell{font-weight:500;color:var(--header-color)}.count-cell,.date-cell{text-align:right}.count-cell{font-weight:600;color:var(--accent-color)}.date-cell{font-size:14px;color:var(--sub-text-color)}`;
+    return `<!DOCTYPE html><html lang="zh-CN"><head><meta charset="UTF-8"><title>${title}</title><style>${styles}</style></head><body><div class="container"><div class="header"><div class="title-group"><h1>${title}</h1></div>${metaInfoHtml}</div><table>${tableHeadHtml}<tbody>${tableRowsHtml}</tbody></table></div></body></html>`;
   }
 };
@@ -393,32 +388,22 @@ var Stat = class {
   }
   renderer;
   /**
+   * @public
    * @method registerCommands
    * @description 根据插件配置，动态地将 `.cmd`, `.msg`, `.rank` 子命令注册到主 `analyse` 命令下。
    * @param {Command} analyse - 主 `analyse` 命令实例。
    */
   registerCommands(analyse) {
     if (this.config.enableCmdStat) {
-      analyse.subcommand(".cmd", "命令使用统计").option("user", "-u [user:user] 指定用户").option("guild", "-g [guildId:string] 指定群组").usage("查询用户或群组的命令使用统计，默认展示全局统计。").action(async ({ session, options }) => {
-        const userId = options.user ? import_koishi3.h.select(options.user, "user")[0]?.attrs.id : void 0;
-        let guildId = options.guild;
-        if (!userId && !guildId && session.guildId) {
-          guildId = session.guildId;
-        } else if (!userId && !guildId && !session.guildId) {
-          return "请指定查询范围";
-        }
+      analyse.subcommand(".cmd", "命令使用统计").option("user", "-u [user:user] 指定用户").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(guildId, userId);
+          const stats = await this.getCommandStats(scope.guildId, scope.userId);
           if (typeof stats === "string") return stats;
-          const title = await this.generateTitle(guildId, userId, { main: "命令" });
-          const renderData = {
-            title,
-            time: /* @__PURE__ */ new Date(),
-            total: stats.total,
-            list: stats.list
-          };
-          const headers = ["命令", "次数", "最后使用"];
-          const result = await this.renderer.renderList(renderData, headers);
+          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);
@@ -427,40 +412,23 @@ var Stat = class {
       });
     }
     if (this.config.enableMsgStat) {
-      analyse.subcommand(".msg", "消息发送统计").option("user", "-u [user:user] 指定用户").option("guild", "-g [guildId:string] 指定群组").option("type", "-t <type:string> 指定类型").usage("查询用户或群组的消息发送统计，默认展示全局统计。").action(async ({ session, options }) => {
-        const userId = options.user ? import_koishi3.h.select(options.user, "user")[0]?.attrs.id : void 0;
-        let guildId = options.guild;
-        if (!userId && !guildId && !options.type && session.guildId) {
-          guildId = session.guildId;
-        } else if (!userId && !guildId && !session.guildId) {
-          return "请指定查询范围";
-        }
+      analyse.subcommand(".msg", "消息发送统计").option("user", "-u [user:user] 指定用户").option("guild", "-g [guildId:string] 指定群组").option("type", "-t <type:string> 指定类型").option("all", "-a 展示全局统计").action(async ({ session, options }) => {
+        const scope = this.parseQueryScope(session, options);
+        if (scope.error) return scope.error;
         try {
           if (options.type) {
-            const stats = await this.getMessageStatsByType(options.type, guildId, userId);
+            const stats = await this.getMessageStatsByType(options.type, scope.guildId, scope.userId);
             if (typeof stats === "string") return stats;
-            const title = await this.generateTitle(guildId, void 0, { main: "消息", subtype: options.type });
-            const renderData = {
-              title,
-              time: /* @__PURE__ */ new Date(),
-              total: stats.total,
-              list: stats.list
-            };
-            const headers = ["用户", "条数", "最后发言"];
-            const result = await this.renderer.renderList(renderData, headers);
+            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.getMessageStats(guildId, userId);
+            const stats = await this.getMessageStats(scope.guildId, scope.userId);
             if (typeof stats === "string") return stats;
-            const title = await this.generateTitle(guildId, userId, { main: "消息" });
-            const renderData = {
-              title,
-              time: /* @__PURE__ */ new Date(),
-              total: stats.total,
-              list: stats.list
-            };
-            const headers = ["类型", "条数", "最后发言"];
-            const result = await this.renderer.renderList(renderData, headers);
+            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) {
@@ -470,27 +438,20 @@ var Stat = class {
       });
     }
     if (this.config.enableRankStat) {
-      analyse.subcommand(".rank", "用户发言排行").option("guild", "-g [guildId:string] 指定群组").option("hours", "-h <hours:number> 指定时长", { fallback: 24 }).usage("查询用户或群组的用户发言排行，默认展示全局统计。").action(async ({ session, options }) => {
-        let guildId = options.guild;
-        if (!guildId && session.guildId) guildId = session.guildId;
-        if (!guildId) return "请指定查询范围";
+      analyse.subcommand(".rank", "用户发言排行").option("guild", "-g [guildId:string] 指定群组").option("all", "-a 展示全局统计").option("hours", "-h <hours:number> 指定时长", { fallback: 24 }).action(async ({ session, options }) => {
+        let guildId = options.all ? void 0 : typeof options.guild === "string" ? options.guild : session.guildId;
+        if (!session.guildId) return "请指定群组 ID";
+        if (!guildId && !options.all) return "请提供查询范围";
         try {
-          const stats = await this.getActiveUserStats(guildId, options.hours);
+          const stats = await this.getActiveUserStats(options.hours, guildId);
           if (typeof stats === "string") return stats;
-          const listWithPercentage = stats.list.map((row) => {
-            const count = row[1];
-            const percentage = stats.total > 0 ? `${(count / stats.total * 100).toFixed(2)}%` : "0.00%";
-            return [...row, percentage];
-          });
+          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 });
-          const renderData = {
-            title,
-            time: /* @__PURE__ */ new Date(),
-            total: stats.total,
-            list: listWithPercentage
-          };
-          const headers = ["用户", "总计发言", "占比"];
-          const result = await this.renderer.renderList(renderData, headers);
+          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;
         } catch (error) {
           this.ctx.logger.error("渲染发言排行图片失败:", error);
@@ -499,6 +460,44 @@ var Stat = class {
       });
     }
   }
+  /**
+   * @private
+   * @method parseQueryScope
+   * @description 解析命令的选项，将其转换为统一的查询范围对象（userId 和 guildId）。
+   * @param {Session} session - 当前会话对象。
+   * @param {QueryScopeOptions} options - 命令传入的选项。
+   * @returns {QueryScopeResult} 包含 userId、guildId 或 error 信息的查询范围对象。
+   */
+  parseQueryScope(session, options) {
+    let userId, guildId;
+    if (typeof options.user === "string") userId = import_koishi3.h.select(options.user, "user")[0]?.attrs.id;
+    else if (options.user) userId = session.userId;
+    if (typeof options.guild === "string") guildId = options.guild;
+    else if (options.guild) {
+      if (!session.guildId) return { error: "请指定群组 ID" };
+      guildId = session.guildId;
+    }
+    if (options.all) return { userId, guildId: void 0 };
+    if (!guildId && !userId) return session.guildId ? { guildId: session.guildId } : { error: "请提供查询范围" };
+    return { userId, guildId };
+  }
+  /**
+   * @private
+   * @async
+   * @method getUidsInScope
+   * @description 根据查询范围（guildId, userId）获取匹配用户的 UID 列表。
+   * @param {string} [guildId] - (可选) 群组 ID。
+   * @param {string} [userId] - (可选) 用户 ID。
+   * @returns {Promise<{ uids?: number[], error?: string }>} 包含 UID 数组或错误信息的对象。
+   */
+  async getUidsInScope(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"]);
+    if (users.length === 0) return { error: "暂无统计数据" };
+    return { uids: users.map((u) => u.uid) };
+  }
   /**
    * @private
    * @async
@@ -513,34 +512,21 @@ var Stat = class {
    * @returns {Promise<string>} 生成的标题字符串。
    */
   async generateTitle(guildId, userId, options) {
-    let scopeText;
+    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"]);
-      const userName = user[0]?.userName || userId;
-      const guildName = guild[0]?.channelName || guildId;
-      scopeText = `${userName} 在 ${guildName}`;
+      scopeText = `${user[0]?.userName || userId} 在 ${guild[0]?.channelName || guildId}`;
     } else if (userId) {
       const user = await this.ctx.database.get("analyse_user", { userId }, ["userName"]);
-      const userName = user[0]?.userName || userId;
-      scopeText = `${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;
-    } else {
-      scopeText = "全局";
-    }
-    switch (options.main) {
-      case "命令":
-        return `${scopeText}的命令统计`;
-      case "消息":
-        if (options.subtype) return `${scopeText}的"${options.subtype}"消息统计`;
-        return `${scopeText}的消息统计`;
-      case "排行":
-        return `${scopeText}的${options.timeRange}小时消息排行`;
-      default:
-        return scopeText;
     }
+    if (options.main === "排行") return `${scopeText}的${options.timeRange}小时消息排行`;
+    if (options.main === "消息" && options.subtype) return `${scopeText}的"${options.subtype}"消息统计`;
+    return `${scopeText}的${options.main}统计`;
   }
   /**
    * @private
@@ -552,20 +538,13 @@ var Stat = class {
    * @returns {Promise<{ list: RenderListItem[], total: number } | string>} 返回一个包含列表和总数的对象，或在无数据时返回提示字符串。
    */
   async getCommandStats(guildId, userId) {
-    const userQuery = {};
-    if (guildId) userQuery.channelId = guildId;
-    if (userId) userQuery.userId = userId;
-    const users = await this.ctx.database.get("analyse_user", userQuery, ["uid"]);
-    if (users.length === 0) return "暂无目标用户统计数据";
-    const uids = users.map((u) => u.uid);
-    const aggregatedStats = 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 (aggregatedStats.length === 0) return "暂无统计数据";
-    const totalCount = aggregatedStats.reduce((sum, record) => sum + record.count, 0);
-    const list = aggregatedStats.map((item) => [item.command, item.count, item.lastUsed]);
-    return { list, total: totalCount };
+    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
@@ -577,20 +556,13 @@ var Stat = class {
    * @returns {Promise<{ list: RenderListItem[], total: number } | string>} 返回一个包含列表和总数的对象，或在无数据时返回提示字符串。
    */
   async getMessageStats(guildId, userId) {
-    const userQuery = {};
-    if (guildId) userQuery.channelId = guildId;
-    if (userId) userQuery.userId = userId;
-    const users = await this.ctx.database.get("analyse_user", userQuery, ["uid"]);
-    if (users.length === 0) return "暂无目标用户统计数据";
-    const uids = users.map((u) => u.uid);
-    const aggregatedStats = await this.ctx.database.select("analyse_msg").where({ uid: { $in: uids } }).groupBy(["type"], {
-      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 (aggregatedStats.length === 0) return "暂无统计数据";
-    const totalCount = aggregatedStats.reduce((sum, record) => sum + record.count, 0);
-    const list = aggregatedStats.map((item) => [item.type, item.count, item.lastUsed]);
-    return { list, total: totalCount };
+    const { uids, error } = await this.getUidsInScope(guildId, userId);
+    if (error) return error;
+    const stats = await this.ctx.database.select("analyse_msg").where({ uid: { $in: uids } }).groupBy("type", { 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.type, item.count, item.lastUsed]);
+    return { list, total };
   }
   /**
    * @private
@@ -600,60 +572,62 @@ var Stat = class {
    * @param {string} type - 要查询的消息类型。
    * @param {string} [guildId] - (可选) 若提供，则将范围限制在此群组。
    * @param {string} [userId] - (可选) 若提供，则将范围限制在此用户。
-   * @returns {Promise<{ list: RenderListItem[], total: number } | string>}
+   * @returns {Promise<{ list: RenderListItem[], total: number } | string>} 返回一个包含列表和总数的对象，或在无数据时返回提示字符串。
    */
   async getMessageStatsByType(type, guildId, userId) {
-    const userQuery = {};
-    if (guildId) userQuery.channelId = guildId;
-    if (userId) userQuery.userId = userId;
-    const users = await this.ctx.database.get("analyse_user", userQuery, ["uid", "userName"]);
-    if (users.length === 0) return "暂无目标用户统计数据";
+    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 aggregatedStats = 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 (aggregatedStats.length === 0) return `暂无统计数据`;
-    const totalCount = aggregatedStats.reduce((sum, record) => sum + record.count, 0);
-    const list = aggregatedStats.map((item) => [
-      userNameMap.get(item.uid) || `UID ${item.uid}`,
-      item.count,
-      item.lastUsed
-    ]);
-    return { list, total: totalCount };
+    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 {string} guildId - 要查询的群组 ID。
+   * @description 从数据库中获取并聚合指定时间范围内的活跃用户排行数据。
    * @param {number} hours - 查询过去的小时数。
-   * @returns {Promise<{ list: RenderListItem[], total: number } | string>}
+   * @param {string} [guildId] - (可选) 要查询的群组 ID。若不提供，则进行全局排行。
+   * @returns {Promise<{ list: RenderListItem[], total: number } | string>} 返回一个包含列表和总数的对象，或在无数据时返回提示字符串。
    */
-  async getActiveUserStats(guildId, hours) {
+  async getActiveUserStats(hours, guildId) {
     const since = new Date(Date.now() - hours * 3600 * 1e3);
-    const usersInGuild = await this.ctx.database.get("analyse_user", { channelId: guildId }, ["uid", "userId", "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 aggregatedStats = await this.ctx.database.select("analyse_msg").where({
-      uid: { $in: uids },
-      hour: { $gte: since }
-    }).groupBy(["uid"], {
-      count: /* @__PURE__ */ __name((row) => import_koishi3.$.sum(row.count), "count")
-    }).orderBy("count", "desc").limit(100).execute();
-    if (aggregatedStats.length === 0) return "暂无统计数据";
-    const totalCount = aggregatedStats.reduce((sum, record) => sum + record.count, 0);
-    const list = aggregatedStats.map((item) => [
-      userNameMap.get(item.uid) || `UID ${item.uid}`,
-      item.count
-    ]);
-    return { list, total: totalCount };
+    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 stats = await this.ctx.database.select("analyse_msg").where({ uid: { $in: uids }, hour: { $gte: since } }).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_msg").where({ hour: { $gte: since } }).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 };
+    }
   }
 };

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chat-analyse",
   "description": "聊天记录分析",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "contributors": [
     "Yis_Rime <yis_rime@outlook.com>"
   ],