koishi-plugin-echo-cave 1.24.0 → 1.24.2

package/lib/index.cjs

@@ -908,24 +908,22 @@ var PREDEFINED_PERIODS = [
   "all"
 ];
 var TIME_UNITS = {
-  m: 60 * 1e3,
-  // minutes
-  h: 60 * 60 * 1e3,
-  // hours
-  d: 24 * 60 * 60 * 1e3,
-  // days
+  m: 30 * 24 * 60 * 60 * 1e3,
+  // 月（按约 30 天算）
   w: 7 * 24 * 60 * 60 * 1e3,
-  // weeks
-  M: 30 * 24 * 60 * 60 * 1e3
-  // months (approximate)
+  // 周
+  d: 24 * 60 * 60 * 1e3,
+  // 天
+  h: 60 * 60 * 1e3
+  // 小时
 };
 function parseCustomTime(timeStr) {
-  const regex = /(\d+)([mhdwM])/g;
+  const regex = /(\d+)([mwdh])/g;
   let match;
   let totalMs = 0;
   let lastUnit = "";
-  const unitOrder = ["M", "w", "d", "h", "m"];
-  if (!/^\d+([mhdwM]\d*)*$/.test(timeStr)) {
+  const unitOrder = ["m", "w", "d", "h"];
+  if (!/^(\d+[mwdh])+$/i.test(timeStr)) {
     return null;
   }
   while ((match = regex.exec(timeStr)) !== null) {
@@ -933,6 +931,7 @@ function parseCustomTime(timeStr) {
     const num = parseInt(value, 10);
     const currentIndex = unitOrder.indexOf(unit);
     const lastIndex = unitOrder.indexOf(lastUnit);
+    if (lastUnit && currentIndex < 0) return null;
     if (lastUnit && currentIndex > lastIndex) {
       return null;
     }
@@ -941,10 +940,10 @@ function parseCustomTime(timeStr) {
   }
   return totalMs;
 }
-function getStartTime(period) {
+function getStartTime(period, customTimeMs) {
   const now = /* @__PURE__ */ new Date();
   const startTime = /* @__PURE__ */ new Date();
-  const customTime = parseCustomTime(period);
+  const customTime = customTimeMs !== void 0 ? customTimeMs : parseCustomTime(period);
   if (customTime !== null) {
     startTime.setTime(now.getTime() - customTime);
     return startTime;
@@ -1038,12 +1037,13 @@ async function getRanking(ctx, session, cfg, period = "all") {
     return;
   }
   const normalizedPeriod = period.toLowerCase();
-  if (!PREDEFINED_PERIODS.includes(normalizedPeriod) && parseCustomTime(normalizedPeriod) === null) {
+  const customTimeMs = parseCustomTime(normalizedPeriod);
+  if (!PREDEFINED_PERIODS.includes(normalizedPeriod) && customTimeMs === null) {
     await session.send(session.text(".invalidPeriod", [PREDEFINED_PERIODS.join(", ")]));
     return;
   }
   const { channelId } = session;
-  const startTime = getStartTime(normalizedPeriod);
+  const startTime = getStartTime(normalizedPeriod, customTimeMs);
   const topCount = cfg.rankingTopCount || 10;
   const caves = await ctx.database.get("echo_cave_v2", {
     channelId,
@@ -1053,8 +1053,13 @@ async function getRanking(ctx, session, cfg, period = "all") {
   });
   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}`);
+  const botName = await getUserName(ctx, session, session.bot?.userId) || "Bot";
+  let periodText;
+  if (customTimeMs !== null) {
+    periodText = normalizedPeriod;
+  } else {
+    periodText = session.text(`.period.${normalizedPeriod}`);
+  }
   let title = session.text(".rankingTitle", [periodText]);
   await session.onebot.sendGroupForwardMsg(channelId, [
     createTextMsgNode(session.bot?.userId || session.userId, botName, title),

package/package.json

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