From 5e6ccdf749a358d78290ebf63045ed7c4b7a64e9 Mon Sep 17 00:00:00 2001
From: m1ngsama <contact@m1ng.space>
Date: Tue, 10 Nov 2026 15:03:39 +0800
Subject: [PATCH] feat(calendar): add schedule detail command with list
 numbering

---
 .../CalendarExtensions.cs                     |  2 +-
 .../PluginMain.cs                             | 77 ++++++++++++-------
 2 files changed, 50 insertions(+), 29 deletions(-)

diff --git a/src/HuaJiBot.NET.Plugin.Calendar/CalendarExtensions.cs b/src/HuaJiBot.NET.Plugin.Calendar/CalendarExtensions.cs
index a1f0d05..54f5980 100644
--- a/src/HuaJiBot.NET.Plugin.Calendar/CalendarExtensions.cs
+++ b/src/HuaJiBot.NET.Plugin.Calendar/CalendarExtensions.cs
@@ -102,7 +102,7 @@ orderby tuple.Period.StartTime ascending //按照开始时间排序
     public static string BuildTextOutput(
         this IEnumerable<(Period period, CalendarEvent e)> @this,
         DateTimeOffset now
-    ) => string.Join("\n\n", @this.Select(item => item.BuildTextOutput(now, true)));
+    ) => string.Join("\n\n", @this.Select((item, i) => $"#{i + 1} {item.BuildTextOutput(now, true)}"));
 
     public static string BuildTextOutput(
         this (Period period, CalendarEvent e) @this,
diff --git a/src/HuaJiBot.NET.Plugin.Calendar/PluginMain.cs b/src/HuaJiBot.NET.Plugin.Calendar/PluginMain.cs
index da20293..14ba5c9 100644
--- a/src/HuaJiBot.NET.Plugin.Calendar/PluginMain.cs
+++ b/src/HuaJiBot.NET.Plugin.Calendar/PluginMain.cs
@@ -167,6 +167,32 @@ public async Task CalendarCommandAsync(GroupMessageEventArgs e)
         await e.Reply(output);
     }
 
+    private async Task<(int week, (CalendarExtensions.Period period, CalendarEvent e)[] events)?> QueryRangeAsync(
+        string? weeks,
+        GroupMessageEventArgs e,
+        DateTimeOffset now
+    )
+    {
+        var week = 1;
+        if (!string.IsNullOrWhiteSpace(weeks) && !int.TryParse(weeks, out week))
+        {
+            await e.Reply("参数错误");
+            return null;
+        }
+        if (week < Config.MinRange || week > Config.MaxRange)
+        {
+            await e.Reply($"超出范围 [{Config.MinRange},{Config.MaxRange}] ");
+            return null;
+        }
+        if (Calendar is null)
+        {
+            await e.Reply("日历获取失败");
+            return null;
+        }
+        var (start, end) = week > 0 ? (now, now.AddDays(7 * week)) : (now.AddDays(7 * week), now);
+        return (week, Calendar.GetEvents(start, end).ToArray());
+    }
+
     [Command("日程", "查看近期日程", Alias = "schedule")]
     // ReSharper disable once UnusedMember.Global
     public async Task CalendarCommandAsync(
@@ -178,41 +204,36 @@ GroupMessageEventArgs e
         if (!await EnterCooldownAsync(e))
             return;
         var now = Utils.NetworkTime.Now;
-        var week = 1;
-        if (!string.IsNullOrWhiteSpace(weeks)) //参数不为空
-        {
-            if (!int.TryParse(weeks, out week)) //尝试转换为数字表示周数
-            {
-                await e.Reply("参数错误");
-                return;
-            }
-        }
+        if (await QueryRangeAsync(weeks, e, now) is not var (week, events))
+            return;
+        await e.Reply($"近{week}周的日程：\n{events.BuildTextOutput(now)}");
+    }
 
-        if (week < Config.MinRange || week > Config.MaxRange) //进行一个输入范围合法性检查
+    [Command("日程详情", "查看日程列表中指定序号的详细信息", Alias = "detail")]
+    // ReSharper disable once UnusedMember.Global
+    public async Task CalendarDetailCommandAsync(
+        [CommandArgumentString("序号")] string? index,
+        [CommandArgumentString("时间")] string? weeks,
+        GroupMessageEventArgs e
+    )
+    {
+        if (!int.TryParse(index, out var n))
         {
-            await e.Reply($"超出范围 [{Config.MinRange},{Config.MaxRange}] ");
+            await e.Reply("请提供日程序号，例如：日程详情 2");
             return;
         }
-        DateTimeOffset start,
-            end;
-        if (week > 0) //正数表示未来
-        {
-            start = now; //开始于当前时间
-            end = start.AddDays(7 * week); //当前时间加上周数
-        }
-        else
-        {
-            end = now; //结束时间
-            start = end.AddDays(7 * week); //week是负的，所以开始时间等于现在减去..
-        }
-        if (Calendar is null)
+        await Sync.UpdateCalendarAsync();
+        if (!await EnterCooldownAsync(e))
+            return;
+        var now = Utils.NetworkTime.Now;
+        if (await QueryRangeAsync(weeks, e, now) is not var (_, events))
+            return;
+        if (n < 1 || n > events.Length)
         {
-            await e.Reply("日历获取失败");
+            await e.Reply(events.Length == 0 ? "没有日程" : $"序号超出范围 [1,{events.Length}]");
             return;
         }
-        var output = Calendar.GetEvents(start, end).BuildTextOutput(now);
-        await e.Reply($"近{week}周的日程：\n{output}");
-        //Service.LogDebug(JsonConvert.SerializeObject(e));
+        await e.Reply($"#{n} {events[n - 1].BuildTextOutput(now)}");
     }
 
     public override IEnumerable<AgentFunctionInfo>? ExportFunctions