koishi-plugin-chat-analyse 0.5.4 → 0.5.5

package/lib/index.js

@@ -504,11 +504,29 @@ var Stat = class {
       };
     }, "createHandler");
     if (this.config.enableCmdStat) {
-      cmd.subcommand("cmdstat", "命令统计").option("user", "-u <user:string> 指定用户").option("guild", "-g <guildId:string> 指定群组").option("all", "-a 全局").action(createHandler(async (scope) => {
+      cmd.subcommand("cmdstat", "命令统计").option("user", "-u <user:string> 指定用户").option("guild", "-g <guildId:string> 指定群组").option("separate", "-h 分离展示").option("all", "-a 全局").action(createHandler(async (scope, options) => {
         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]);
+        let processedStats;
+        if (options.separate) {
+          processedStats = stats;
+        } else {
+          const mergedStatsMap = /* @__PURE__ */ new Map();
+          for (const stat of stats) {
+            const mainCommand = stat.command.split(".")[0];
+            const existing = mergedStatsMap.get(mainCommand) || { count: 0, lastUsed: /* @__PURE__ */ new Date(0) };
+            existing.count += stat.count;
+            if (stat.lastUsed > existing.lastUsed) existing.lastUsed = stat.lastUsed;
+            mergedStatsMap.set(mainCommand, existing);
+          }
+          processedStats = Array.from(mergedStatsMap.entries()).map(([command, data]) => ({
+            command,
+            count: data.count,
+            lastUsed: data.lastUsed
+          })).sort((a, b) => b.count - a.count);
+        }
+        const total = processedStats.reduce((sum, record) => sum + record.count, 0);
+        const list = processedStats.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 }, ["命令", "次数", "最后使用"]);
       }));
@@ -799,7 +817,8 @@ var Data = class {
       ]);
       const uniqueChannels = [...new Map(allChannelInfo.map((item) => [item.channelId, item])).values()];
       const channelOutput = uniqueChannels.length ? "频道列表:\n" + uniqueChannels.map((c) => `[${c.channelId}] ${c.channelName}`).join("\n") : "暂无频道记录";
-      const commandOutput = commands.length ? "命令列表:\n" + commands.join(", ") : "暂无命令记录";
+      const commandNames = commands.map((c) => c.command);
+      const commandOutput = commandNames.length ? "命令列表:\n" + commandNames.join(", ") : "暂无命令记录";
       return `${channelOutput}
 ${commandOutput}`;
     });

package/package.json

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