From 18c81232ce463511f48e594facb193d0273c83e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E7=AB=A0=E6=B5=A9?= Date: Fri, 14 Aug 2026 12:35:33 +0800 Subject: [PATCH] fix: keep only setting command entries --- internal/settings/controller.go | 5 +---- internal/settings/controller_test.go | 26 ++++++++++++++++++++------ internal/settings/settings.go | 5 +---- internal/settings/settings_test.go | 4 ++-- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/internal/settings/controller.go b/internal/settings/controller.go index 1f6de4a..34b5dce 100644 --- a/internal/settings/controller.go +++ b/internal/settings/controller.go @@ -77,9 +77,6 @@ func (c *Controller) Handle(ctx context.Context, in SettingInput) (string, error action = s.PendingAction args = []string{action, strings.TrimSpace(in.Text)} } - if explicit && cmd.Name == "/help" { - return "设置回答语言:/setting language \n例如:/setting language en", nil - } if explicit && len(args) == 1 && len(args[0]) == 6 && allDigits(args[0]) { if strings.TrimSpace(in.ConversationType) != "direct" { return "管理员绑定码只能私聊机器人使用。", nil @@ -162,7 +159,7 @@ func (c *Controller) Handle(ctx context.Context, in SettingInput) (string, error } func settingMenu(admin, direct bool) string { - menu := "⚙️ 个人设置\n" + + menu := "⚙️ 个人设置\n入口:/setting 或 /设置\n" + "回答语言:/setting language \n" + "- auto:跟随当前提问语言(推荐)\n" + "- zh-CN:简体中文\n" + diff --git a/internal/settings/controller_test.go b/internal/settings/controller_test.go index 1ad03b4..0750766 100644 --- a/internal/settings/controller_test.go +++ b/internal/settings/controller_test.go @@ -159,19 +159,33 @@ func TestControllerExplicitlyTestsAndActivatesSupportGroup(t *testing.T) { t.Fatalf("reply=%q", out) } } -func TestControllerHelpIsHandledLocally(t *testing.T) { +func TestControllerOnlyHandlesSettingEntrypoints(t *testing.T) { r := newMemoryRepo() c := NewController(r) - if !c.ShouldHandle(context.Background(), "t", "u", "/help") { - t.Fatal("help must be intercepted before QA") + if c.ShouldHandle(context.Background(), "t", "u", "/help") { + t.Fatal("help must not enter the settings controller") } out, err := c.Handle(context.Background(), SettingInput{TenantKey: "t", StaffID: "u", Text: "/help", ConversationType: "direct"}) if err != nil { t.Fatal(err) } - want := "设置回答语言:/setting language \n例如:/setting language en" - if out != want { - t.Fatalf("help=%q want %q", out, want) + if out != "" { + t.Fatalf("help reply=%q must be empty", out) + } +} + +func TestControllerChineseSettingAliasRunsSubcommands(t *testing.T) { + r := newMemoryRepo() + c := NewController(r) + if !c.ShouldHandle(context.Background(), "t", "u", "/设置 language ja") { + t.Fatal("Chinese setting alias must be handled") + } + out, err := c.Handle(context.Background(), SettingInput{TenantKey: "t", Channel: "dingtalk", StaffID: "u", Text: "/设置 language ja", ConversationType: "direct"}) + if err != nil { + t.Fatal(err) + } + if r.prefs["t/u"] != "ja" || !strings.Contains(out, "ja") { + t.Fatalf("pref=%q reply=%q", r.prefs["t/u"], out) } } diff --git a/internal/settings/settings.go b/internal/settings/settings.go index 49dbf70..d4347b8 100644 --- a/internal/settings/settings.go +++ b/internal/settings/settings.go @@ -53,12 +53,9 @@ func ParseCommand(raw string) (Command, bool) { if len(fields) == 0 { return Command{}, false } - if strings.HasPrefix(fields[0], "//") { - fields[0] = "/" + strings.TrimLeft(fields[0], "/") - } name := strings.ToLower(fields[0]) switch name { - case "/setting", "/settings", "/设置", "/help": + case "/setting", "/设置": default: return Command{}, false } diff --git a/internal/settings/settings_test.go b/internal/settings/settings_test.go index 55ce770..a0e2803 100644 --- a/internal/settings/settings_test.go +++ b/internal/settings/settings_test.go @@ -29,13 +29,13 @@ func TestDetermineState(t *testing.T) { } func TestParseCommandStrict(t *testing.T) { - yes := []string{"/setting", "//setting", "/settings", "/设置", "/help", "//help", "/setting 123456", "/setting language ja", "//setting language en", "/setting support", "/setting question https://alidocs.dingtalk.com/i/nodes/abc"} + yes := []string{"/setting", "/设置", "/setting 123456", "/设置 123456", "/setting language ja", "/设置 language ja", "/setting support", "/设置 question https://alidocs.dingtalk.com/i/nodes/abc"} for _, raw := range yes { if c, ok := ParseCommand(raw); !ok || c.Name == "" { t.Fatalf("must match %q", raw) } } - no := []string{"如何设置机器人", "abc /setting", "请解释/setting", "/settiing"} + no := []string{"/help", "//help", "/settings", "//setting", "如何设置机器人", "abc /setting", "请解释/setting", "/settiing"} for _, raw := range no { if _, ok := ParseCommand(raw); ok { t.Fatalf("must not match %q", raw)