koishi-plugin-echo-cave 1.22.2 → 1.24.0

package/lib/core/command/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 declare const SUPPORTED_PERIODS: Period[];
+export type Period = 'lday' | 'lweek' | 'lmonth' | 'day' | 'week' | 'month' | 'all' | string;
+export declare const PREDEFINED_PERIODS: Array<Period>;
 export declare function getRanking(ctx: Context, session: Session, cfg: Config, period?: string): Promise<void>;

package/lib/index.cjs

@@ -178,14 +178,17 @@ var require_zh_CN2 = __commonJS({
         "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}",
+            invalidPeriod: "\u65E0\u6548\u7684\u65F6\u95F4\u6BB5\u53C2\u6570\u3002\u652F\u6301\u7684\u65F6\u95F4\u6BB5\uFF1A{0}\uFF0C\u6216\u81EA\u5B9A\u4E49\u65F6\u95F4\u683C\u5F0F(\u5982: 1d, 2d5h, 30m)",
             rankingTitle: "\u{1F4CA} \u56DE\u58F0\u6D1E\u6392\u884C\u699C ({0})",
             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,23 +898,90 @@ async function bindUsersToCave(ctx, session, id, userIds) {
 }
 
 // src/core/command/rank.ts
-var SUPPORTED_PERIODS = ["day", "week", "month", "all"];
+var PREDEFINED_PERIODS = [
+  "lday",
+  "lweek",
+  "lmonth",
+  "day",
+  "week",
+  "month",
+  "all"
+];
+var TIME_UNITS = {
+  m: 60 * 1e3,
+  // minutes
+  h: 60 * 60 * 1e3,
+  // hours
+  d: 24 * 60 * 60 * 1e3,
+  // days
+  w: 7 * 24 * 60 * 60 * 1e3,
+  // weeks
+  M: 30 * 24 * 60 * 60 * 1e3
+  // months (approximate)
+};
+function parseCustomTime(timeStr) {
+  const regex = /(\d+)([mhdwM])/g;
+  let match;
+  let totalMs = 0;
+  let lastUnit = "";
+  const unitOrder = ["M", "w", "d", "h", "m"];
+  if (!/^\d+([mhdwM]\d*)*$/.test(timeStr)) {
+    return null;
+  }
+  while ((match = regex.exec(timeStr)) !== null) {
+    const [, value, unit] = match;
+    const num = parseInt(value, 10);
+    const currentIndex = unitOrder.indexOf(unit);
+    const lastIndex = unitOrder.indexOf(lastUnit);
+    if (lastUnit && currentIndex > lastIndex) {
+      return null;
+    }
+    totalMs += num * TIME_UNITS[unit];
+    lastUnit = unit;
+  }
+  return totalMs;
+}
 function getStartTime(period) {
   const now = /* @__PURE__ */ new Date();
   const startTime = /* @__PURE__ */ new Date();
+  const customTime = parseCustomTime(period);
+  if (customTime !== null) {
+    startTime.setTime(now.getTime() - customTime);
+    return startTime;
+  }
   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;
+    // Default case (should not happen due to validation)
+    default:
+      startTime.setTime(0);
+      break;
   }
   return startTime;
 }
@@ -968,8 +1038,8 @@ async function getRanking(ctx, session, cfg, period = "all") {
     return;
   }
   const normalizedPeriod = period.toLowerCase();
-  if (!SUPPORTED_PERIODS.includes(normalizedPeriod)) {
-    await session.send(session.text(".invalidPeriod", [SUPPORTED_PERIODS.join(", ")]));
+  if (!PREDEFINED_PERIODS.includes(normalizedPeriod) && parseCustomTime(normalizedPeriod) === null) {
+    await session.send(session.text(".invalidPeriod", [PREDEFINED_PERIODS.join(", ")]));
     return;
   }
   const { channelId } = session;

package/package.json

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