koishi-plugin-chat-analyse 0.6.3 → 0.6.4

package/lib/Renderer.d.ts

@@ -19,6 +19,7 @@ export interface CircadianChartData {
     time: Date;
     total: string | number;
     data: number[];
+    labels?: string[];
 }
 /**
  * @class Renderer

package/lib/index.d.ts

@@ -54,6 +54,7 @@ export declare function generateTitle(ctx: Context, scopeDesc: {
     main: string;
     subtype?: string;
     timeRange?: number;
+    timeUnit?: '小时' | '天';
 }): Promise<string>;
 /**
  * @function apply

package/lib/index.js

@@ -425,16 +425,15 @@ var Renderer = class {
    * @returns {Promise<string | Buffer[]>} - 成功时返回包含图片 Buffer 的数组，失败或无数据时返回提示字符串。
    */
   async renderCircadianChart(data) {
-    const { title, time, total, data: hourlyCounts } = data;
+    const { title, time, total, data: hourlyCounts, labels } = data;
     if (!hourlyCounts || hourlyCounts.every((c) => c === 0)) return "暂无数据可供渲染";
     const maxCount = Math.max(...hourlyCounts, 1);
     const chartStyles = `
       .chart-container { display: flex; align-items: flex-end; gap: 4px; height: 180px; padding: 30px 15px 10px; }
       .bar-wrapper { flex: 1; text-align: center; display: flex; flex-direction: column; justify-content: flex-end; height: 100%; }
-      .bar-value { font-size: 11px; color: var(--sub-text-color); height: 16px; line-height: 16px; font-weight: 500; visibility: ${maxCount > 50 ? "hidden" : "visible"}; }
+      .bar-value { font-size: 11px; color: var(--sub-text-color); height: 16px; line-height: 16px; font-weight: 500; }
       .bar-container { flex-grow: 1; display: flex; align-items: flex-end; width: 100%; }
       .bar { width: 100%; background-color: var(--accent-color); opacity: .7; border-radius: 3px 3px 0 0; transition: height .3s ease-out; }
-      .bar.peak { opacity: 1; background-color: var(--gold); }
       .bar-label { font-size: 10px; color: var(--sub-text-color); margin-top: 4px; height: 12px; }
     `;
     const cardHtml = `
@@ -449,9 +448,9 @@ var Renderer = class {
             <div class="bar-wrapper">
               <div class="bar-value">${count > 0 ? count : ""}</div>
               <div class="bar-container">
-                <div class="bar ${count === maxCount ? "peak" : ""}" style="height: ${count / maxCount * 100}%;"></div>
+                <div class="bar" style="height: ${count / maxCount * 100}%;"></div>
               </div>
-              <div class="bar-label">${hour}</div>
+              <div class="bar-label">${labels ? labels[hour] : hour}</div>
             </div>`).join("")}
         </div>
       </div>`;
@@ -615,17 +614,58 @@ var Stat = class {
       }));
     }
     if (this.config.enableActivity) {
-      cmd.subcommand("activity", "活跃统计").option("user", "-u <user:string> 指定用户").option("guild", "-g <guildId:string> 指定群组").option("all", "-a 全局").action(createHandler(async (scope) => {
-        const hourlyStats = await this.ctx.database.select("analyse_rank").where({ uid: { $in: scope.uids } }).groupBy(["timestamp"], { count: /* @__PURE__ */ __name((row) => import_koishi3.$.sum(row.count), "count") }).execute();
-        if (hourlyStats.length === 0) return "暂无统计数据";
-        const hourlyCounts = Array(24).fill(0);
-        let totalMessages = 0;
-        hourlyStats.forEach((stat) => {
-          hourlyCounts[stat.timestamp.getHours()] += stat.count;
-          totalMessages += stat.count;
-        });
-        const title = await generateTitle(this.ctx, scope.scopeDesc, { main: "活跃" });
-        return this.renderer.renderCircadianChart({ title, time: /* @__PURE__ */ new Date(), total: totalMessages, data: hourlyCounts });
+      cmd.subcommand("activity", "活跃统计").option("user", "-u <user:string> 指定用户").option("guild", "-g <guildId:string> 指定群组").option("hours", "-h <hours:number> 指定偏移时长").option("all", "-a 全局").option("days", "-d 切换至天数").action(createHandler(async (scope, options) => {
+        const { days, hours } = options;
+        if (days) {
+          const timeRangeInDays = 24;
+          const since = new Date(Date.now() - timeRangeInDays * import_koishi3.Time.day);
+          const stats = await this.ctx.database.select("analyse_rank").where({ uid: { $in: scope.uids }, timestamp: { $gte: since } }).project(["timestamp", "count"]).execute();
+          if (stats.length === 0) return "暂无统计数据";
+          const startOfToday = /* @__PURE__ */ new Date();
+          startOfToday.setHours(0, 0, 0, 0);
+          const dailyCounts = Array(timeRangeInDays).fill(0);
+          const dayLabels = Array(timeRangeInDays).fill("");
+          for (let i = 0; i < timeRangeInDays; i++) {
+            const d = new Date(startOfToday.getTime() - i * import_koishi3.Time.day);
+            dayLabels[timeRangeInDays - 1 - i] = String(d.getDate());
+          }
+          stats.forEach((stat) => {
+            const statDayStart = new Date(stat.timestamp);
+            statDayStart.setHours(0, 0, 0, 0);
+            const daysAgo = Math.round((startOfToday.getTime() - statDayStart.getTime()) / import_koishi3.Time.day);
+            if (daysAgo >= 0 && daysAgo < timeRangeInDays) {
+              const index = timeRangeInDays - 1 - daysAgo;
+              dailyCounts[index] += stat.count;
+            }
+          });
+          const totalMessages = dailyCounts.reduce((a, b) => a + b, 0);
+          const title = await generateTitle(this.ctx, scope.scopeDesc, { main: "活跃", timeRange: timeRangeInDays, timeUnit: "天" });
+          return this.renderer.renderCircadianChart({ title, time: /* @__PURE__ */ new Date(), total: totalMessages, data: dailyCounts, labels: dayLabels });
+        } else {
+          const timeWindowHours = 24;
+          const offsetHours = typeof hours === "number" ? hours : 0;
+          const now = /* @__PURE__ */ new Date();
+          const until = new Date(now.getTime() - offsetHours * import_koishi3.Time.hour);
+          const since = new Date(until.getTime() - timeWindowHours * import_koishi3.Time.hour);
+          const hourlyStats = await this.ctx.database.select("analyse_rank").where({ uid: { $in: scope.uids }, timestamp: { $gte: since, $lt: until } }).groupBy("timestamp", { count: /* @__PURE__ */ __name((row) => import_koishi3.$.sum(row.count), "count") }).execute();
+          if (hourlyStats.length === 0) return "暂无统计数据";
+          const processedCounts = Array(timeWindowHours).fill(0);
+          const hourLabels = Array(timeWindowHours).fill("");
+          for (let i = 0; i < timeWindowHours; i++) {
+            const d = new Date(until.getTime() - (i + 1) * import_koishi3.Time.hour);
+            hourLabels[timeWindowHours - 1 - i] = String(d.getHours());
+          }
+          hourlyStats.forEach((stat) => {
+            const hoursBeforeUntil = Math.floor((until.getTime() - stat.timestamp.getTime()) / import_koishi3.Time.hour);
+            if (hoursBeforeUntil >= 0 && hoursBeforeUntil < timeWindowHours) {
+              const index = timeWindowHours - 1 - hoursBeforeUntil;
+              processedCounts[index] += stat.count;
+            }
+          });
+          const totalMessages = processedCounts.reduce((a, b) => a + b, 0);
+          const title = await generateTitle(this.ctx, scope.scopeDesc, { main: "活跃", timeRange: timeWindowHours, timeUnit: "小时" });
+          return this.renderer.renderCircadianChart({ title, time: /* @__PURE__ */ new Date(), total: totalMessages, data: processedCounts, labels: hourLabels });
+        }
       }));
     }
   }
@@ -997,16 +1037,18 @@ async function generateTitle(ctx, scopeDesc, options) {
     const [user] = await ctx.database.get("analyse_user", { userId: scopeDesc.userId }, ["userName"]);
     userName = user?.userName || scopeDesc.userId;
   }
+  const timeText = options.timeRange ? `${options.timeRange}${options.timeUnit || "小时"}` : "";
   const typeText = options.subtype ? `“${options.subtype}”` : "";
   const mainText = options.main;
-  if (mainText.includes("排行")) {
+  if (mainText.includes("排行") || mainText.includes("活跃")) {
     scopeText = guildName || "全局";
-    return `${options.timeRange}小时${scopeText}${typeText}${mainText}`;
+  } else {
+    if (userName && guildName) scopeText = `${guildName} ${userName}`;
+    else if (userName) scopeText = userName;
+    else if (guildName) scopeText = guildName;
   }
-  if (userName && guildName) scopeText = `${guildName} ${userName}`;
-  else if (userName) scopeText = userName;
-  else if (guildName) scopeText = guildName;
-  return `${scopeText}${typeText}${mainText}统计`;
+  const suffix = mainText.includes("排行") ? "" : "统计";
+  return `${timeText}${scopeText}${typeText}${mainText}${suffix}`;
 }
 __name(generateTitle, "generateTitle");
 function apply(ctx, config) {

package/package.json

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