koishi-plugin-echo-cave 1.22.1 → 1.23.0

package/lib/config/config.d.ts

@@ -12,6 +12,5 @@ export interface Config {
     useBase64ForMedia?: boolean;
     sendAllAsForwardMsg?: boolean;
     rankingTopCount?: number;
-    considerOriginUserAsRelated?: boolean;
 }
 export declare const Config: Schema<Config>;

package/lib/core/command/{ranking.d.ts → rank.d.ts}

@@ -1,5 +1,5 @@
 import { Config } from '../../config/config';
 import { Context, Session } from 'koishi';
-export type Period = 'day' | 'week' | 'month' | 'all';
+export type Period = 'lday' | 'lweek' | 'lmonth' | 'day' | 'week' | 'month' | 'all';
 export declare const SUPPORTED_PERIODS: Period[];
 export declare function getRanking(ctx: Context, session: Session, cfg: Config, period?: string): Promise<void>;

package/lib/index.cjs

@@ -44,8 +44,7 @@ var require_zh_CN = __commonJS({
       maxRecordSize: "\u6700\u5927\u5F55\u97F3\u5927\u5C0F (MB)",
       useBase64ForMedia: "\u662F\u5426\u4F7F\u7528 Base64 \u7F16\u7801\u53D1\u9001\u5A92\u4F53\u6587\u4EF6\uFF0C\u5F00\u542F\u540E\u5C06\u8BFB\u53D6 base64 \u7F16\u7801\u53D1\u9001\u800C\u4E0D\u662F\u4F7F\u7528 file uri",
       sendAllAsForwardMsg: "\u662F\u5426\u5C06\u6240\u6709\u6D88\u606F\u4EE5\u8F6C\u53D1\u6D88\u606F\u5F62\u5F0F\u53D1\u9001\uFF0C\u5F00\u542F\u540E\u666E\u901A\u6D88\u606F\u4E5F\u4F1A\u8F6C\u6362\u4E3A\u8F6C\u53D1\u6D88\u606F\u683C\u5F0F",
-      rankingTopCount: "\u6392\u884C\u699C\u663E\u793A\u7684\u7528\u6237\u6570\u91CF",
-      considerOriginUserAsRelated: "\u662F\u5426\u5C06\u539F\u6D88\u606F\u53D1\u9001\u8005\u89C6\u4E3A\u76F8\u5173\u7528\u6237\uFF0C\u9ED8\u8BA4\u4E0D\u8003\u8651"
+      rankingTopCount: "\u6392\u884C\u699C\u663E\u793A\u7684\u7528\u6237\u6570\u91CF"
     };
   }
 });
@@ -176,7 +175,7 @@ var require_zh_CN2 = __commonJS({
             userBoundSuccess: "\u2705 \u5DF2\u6210\u529F\u5C06\u7528\u6237\u7ED1\u5B9A\u5230\u56DE\u58F0\u6D1E #{0}\uFF01"
           }
         },
-        "cave.ranking": {
+        "cave.rank": {
           description: "\u67E5\u770B\u56DE\u58F0\u6D1E\u6392\u884C\u699C",
           messages: {
             invalidPeriod: "\u65E0\u6548\u7684\u65F6\u95F4\u6BB5\u53C2\u6570\u3002\u652F\u6301\u7684\u65F6\u95F4\u6BB5\uFF1A{0}",
@@ -184,9 +183,12 @@ var require_zh_CN2 = __commonJS({
             noData: "\u6682\u65E0\u6570\u636E",
             rankFormat: "{rankEmoji} {userName}\uFF1A{count} \u4E2A\u56DE\u58F0\u6D1E",
             period: {
-              day: "24 \u5C0F\u65F6",
-              week: "7 \u5929",
-              month: "1 \u4E2A\u6708",
+              lday: "\u8FC7\u53BB 24 \u5C0F\u65F6",
+              lweek: "\u8FC7\u53BB 7 \u5929",
+              lmonth: "\u8FC7\u53BB 30 \u5929",
+              day: "\u4ECA\u5929",
+              week: "\u672C\u5468",
+              month: "\u672C\u6708",
               all: "\u6240\u6709\u65F6\u95F4"
             }
           }
@@ -895,35 +897,60 @@ async function bindUsersToCave(ctx, session, id, userIds) {
   return session.text(".userBoundSuccess", [id]);
 }
 
-// src/core/command/ranking.ts
-var SUPPORTED_PERIODS = ["day", "week", "month", "all"];
+// src/core/command/rank.ts
+var SUPPORTED_PERIODS = [
+  "lday",
+  "lweek",
+  "lmonth",
+  "day",
+  "week",
+  "month",
+  "all"
+];
 function getStartTime(period) {
   const now = /* @__PURE__ */ new Date();
   const startTime = /* @__PURE__ */ new Date();
   switch (period) {
-    case "day":
+    // Last day/week/month (previous 24h, 7d, 30d)
+    case "lday":
       startTime.setDate(now.getDate() - 1);
       break;
-    case "week":
+    case "lweek":
       startTime.setDate(now.getDate() - 7);
       break;
+    case "lmonth":
+      startTime.setDate(now.getDate() - 30);
+      break;
+    // This day/week/month (from start of period to now)
+    case "day":
+      startTime.setHours(0, 0, 0, 0);
+      break;
+    case "week":
+      const dayOfWeek = now.getDay();
+      const daysToMonday = dayOfWeek === 0 ? 6 : dayOfWeek - 1;
+      startTime.setDate(now.getDate() - daysToMonday);
+      startTime.setHours(0, 0, 0, 0);
+      break;
     case "month":
-      startTime.setMonth(now.getMonth() - 1);
+      startTime.setDate(1);
+      startTime.setHours(0, 0, 0, 0);
       break;
+    // All time
     case "all":
       startTime.setTime(0);
       break;
   }
   return startTime;
 }
-function countUserOccurrences(caves, considerOriginUser) {
+function countUserOccurrences(caves) {
   const countMap = /* @__PURE__ */ new Map();
   caves.forEach((cave) => {
-    cave.relatedUsers.forEach((userId) => {
-      countMap.set(userId, (countMap.get(userId) || 0) + 1);
-    });
-    if (considerOriginUser) {
+    if (cave.relatedUsers.length === 0) {
       countMap.set(cave.originUserId, (countMap.get(cave.originUserId) || 0) + 1);
+    } else {
+      cave.relatedUsers.forEach((userId) => {
+        countMap.set(userId, (countMap.get(userId) || 0) + 1);
+      });
     }
   });
   return countMap;
@@ -981,7 +1008,7 @@ async function getRanking(ctx, session, cfg, period = "all") {
       $gte: startTime
     }
   });
-  const countMap = countUserOccurrences(caves, cfg.considerOriginUserAsRelated || false);
+  const countMap = countUserOccurrences(caves);
   const rankingText = await generateRankingText(ctx, session, countMap, topCount);
   const botName = await getUserName(this.ctx, session, session.bot?.userId) || "Bot";
   const periodText = session.text(`.period.${period}`);
@@ -1042,8 +1069,7 @@ var Config = import_koishi2.Schema.object({
   maxRecordSize: import_koishi2.Schema.number().default(512),
   useBase64ForMedia: import_koishi2.Schema.boolean().default(false),
   sendAllAsForwardMsg: import_koishi2.Schema.boolean().default(false),
-  rankingTopCount: import_koishi2.Schema.number().default(10),
-  considerOriginUserAsRelated: import_koishi2.Schema.boolean().default(true)
+  rankingTopCount: import_koishi2.Schema.number().default(10)
 }).i18n({
   "zh-CN": require_zh_CN()
 });
@@ -1119,7 +1145,7 @@ function apply(ctx, cfg) {
   ctx.command("cave.bind <id:number> <...userIds>", { authority: 4 }).action(
     async ({ session }, id, ...userIds) => await bindUsersToCave(ctx, session, id, userIds)
   );
-  ctx.command("cave.ranking [period:string]").action(
+  ctx.command("cave.rank [period:string]").action(
     async ({ session }, period) => await getRanking(ctx, session, cfg, period)
   );
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-echo-cave",
   "description": "Group echo cave",
-  "version": "1.22.1",
+  "version": "1.23.0",
   "main": "lib/index.cjs",
   "typings": "lib/index.d.ts",
   "type": "module",