koishi-plugin-ll-schedule 1.7.1 → 1.7.2

package/index.js

@@ -310,6 +310,24 @@ function findNextInstance(instances, current) {
   return best
 }
 
+// 从某一时刻（date+hm）往后找最近的一场（用于测试：按"现在"算下一场）
+function findNextFromNow(instances, date, hm) {
+  const day = todayDay(date)
+  const nowMin = hmToMin(hm)
+  let best = null
+  let bestKey = Infinity
+  for (const inst of instances) {
+    let offset = (inst.day - day + 7) % 7
+    if (offset === 0 && inst.startMin < nowMin) offset = 7
+    const key = offset * 1440 + inst.startMin
+    if (key < bestKey) {
+      bestKey = key
+      best = inst
+    }
+  }
+  return best
+}
+
 // 计算"现在这一分钟该发哪些提前提醒"
 function computeReminders(activities, date, hm) {
   const day = todayDay(date)
@@ -360,7 +378,7 @@ function renderRemindTemplate(tpl, vars) {
   return kept.join('\n').replace(/\n{3,}/g, '\n\n').trim()
 }
 
-exports._test = { parseTimes, todayDay, parseDays, dayMatches, parseScheduleBlocks, parseScheduleRows, summarizeRows, computeFires, renderText, renderPushTemplate, hmToMin, parseActivities, expandInstances, findNextInstance, computeReminders, renderRemindTemplate, DEFAULT_REMIND_TPL, buildMd, buildTextFromMd }
+exports._test = { parseTimes, todayDay, parseDays, dayMatches, parseScheduleBlocks, parseScheduleRows, summarizeRows, computeFires, renderText, renderPushTemplate, hmToMin, parseActivities, expandInstances, findNextInstance, findNextFromNow, computeReminders, renderRemindTemplate, DEFAULT_REMIND_TPL, buildMd, buildTextFromMd }
 
 // ===== 配置 Schema =====
 
@@ -907,21 +925,38 @@ function apply(ctx, config) {
     })
 
   // 活动表模式下：把某个活动的提醒测试发到当前群；返回 null 表示当前不是活动表模式
+  // 测试一律以"现在"为基准：
+  //   · 指定活动名 → 取该活动从此刻起最近的一次
+  //   · 不指定 → 直接取此刻之后最近的一次提醒（等于"下一条会发的提醒"）
+  //   · "下一时段活动"也按此刻往后算
   async function testActivityToGroup(session, name) {
     const acts = parseActivities(config.activities)
     if (!acts.length) return null
-    const act = name
-      ? (acts.find(a => a.name === name) || acts.find(a => a.name.includes(name)))
-      : acts[0]
-    if (!act) return `未找到活动 "${name}"，可用 schedule.list 查看活动表`
     const instances = expandInstances(acts)
-    const inst = instances.find(i => i.activity === act.name)
     const now = new Date()
-    const text = renderRemindTemplate(config.remindTemplate, makeRemindVars(inst, findNextInstance(instances, inst), now, nowHM(now)))
+    const hm = nowHM(now)
+    const act = name
+      ? (acts.find(a => a.name === name) || acts.find(a => a.name.includes(name)))
+      : null
+    if (name && !act) return `未找到活动 "${name}"，可用 schedule.list 查看活动表`
+
+    let inst
+    if (act) {
+      const own = instances.filter(i => i.activity === act.name)
+      inst = findNextFromNow(own, now, hm) || own[0]
+    }
+    else {
+      inst = findNextFromNow(instances, now, hm) || instances[0]
+    }
+    if (!inst) return '活动表里还没有可用的时段'
+    // 下一场：按"现在"往后算，并排除自己
+    const next = findNextFromNow(instances.filter(i => i !== inst), now, hm)
+
+    const text = renderRemindTemplate(config.remindTemplate, makeRemindVars(inst, next, now, hm))
     const bot = (ctx.bots || []).find(b => b.sid === session.bot?.sid)
     if (!bot || !session.guildId) return '❌ 只能在群里测试'
     await sendOne(bot, String(session.guildId), text, { markdown: !!config.remindMarkdown })
-    return `✅ 已向本群测试发送「${act.name}」的提醒`
+    return `✅ 已向本群测试发送「${inst.activity}」的提醒（星期${WEEK_CN[inst.day]} ${inst.start}）`
   }
 
   ctx.command('schedule.test [name:text]', '测试发送提醒（发到当前群）')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-ll-schedule",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "description": "Scheduled message sender with weekly slots (per-day time & content), QQ official markdown card support",
   "main": "index.js",
   "files": [
@@ -33,3 +33,4 @@
 
 
 
+