From 1b9e4714f7578810fb55051c3e37c925e6a8476b Mon Sep 17 00:00:00 2001 From: Siwoo Jeon Date: Sun, 13 Jul 2025 15:58:15 +0900 Subject: [PATCH] rename: dev commands --- commands/{devBlock.go => dev/block.go} | 13 +++++++------ .../{devReloadPrompt.go => dev/reloadPrompt.go} | 13 +++++++------ commands/{devSwitchMode.go => dev/switchMode.go} | 13 +++++++------ commands/{devUnblock.go => dev/unblock.go} | 13 +++++++------ handler/interactionCreate.go | 2 -- main.go | 9 +++++---- 6 files changed, 33 insertions(+), 30 deletions(-) rename commands/{devBlock.go => dev/block.go} (82%) rename commands/{devReloadPrompt.go => dev/reloadPrompt.go} (69%) rename commands/{devSwitchMode.go => dev/switchMode.go} (69%) rename commands/{devUnblock.go => dev/unblock.go} (80%) diff --git a/commands/devBlock.go b/commands/dev/block.go similarity index 82% rename from commands/devBlock.go rename to commands/dev/block.go index f807173..d668a49 100644 --- a/commands/devBlock.go +++ b/commands/dev/block.go @@ -1,10 +1,11 @@ -package commands +package dev import ( "context" "fmt" "strings" + "git.wh64.net/muffin/goMuffin/commands" "git.wh64.net/muffin/goMuffin/configs" "git.wh64.net/muffin/goMuffin/databases" "git.wh64.net/muffin/goMuffin/utils" @@ -12,19 +13,19 @@ import ( "go.mongodb.org/mongo-driver/v2/bson" ) -var BlockCommand *Command = &Command{ +var BlockCommand *commands.Command = &commands.Command{ ApplicationCommand: &discordgo.ApplicationCommand{ Name: "차단", Description: "유저를 차단해요.", }, - DetailedDescription: &DetailedDescription{ + DetailedDescription: &commands.DetailedDescription{ Usage: fmt.Sprintf("%s차단 (유저의 ID) [사유]", configs.Config.Bot.Prefix), }, - Category: DeveloperOnly, + Category: commands.DeveloperOnly, RegisterApplicationCommand: false, RegisterMessageCommand: true, - Flags: CommandFlagsIsDeveloper, - MessageRun: func(ctx *MsgContext) error { + Flags: commands.CommandFlagsIsDeveloper, + MessageRun: func(ctx *commands.MsgContext) error { var reason string if len(*ctx.Args) < 1 { utils.NewMessageSender(ctx.Msg). diff --git a/commands/devReloadPrompt.go b/commands/dev/reloadPrompt.go similarity index 69% rename from commands/devReloadPrompt.go rename to commands/dev/reloadPrompt.go index b939737..6b9fbda 100644 --- a/commands/devReloadPrompt.go +++ b/commands/dev/reloadPrompt.go @@ -1,27 +1,28 @@ -package commands +package dev import ( "fmt" "git.wh64.net/muffin/goMuffin/chatbot" + "git.wh64.net/muffin/goMuffin/commands" "git.wh64.net/muffin/goMuffin/configs" "git.wh64.net/muffin/goMuffin/utils" "github.com/bwmarrin/discordgo" ) -var ReloadPromptCommand *Command = &Command{ +var ReloadPromptCommand *commands.Command = &commands.Command{ ApplicationCommand: &discordgo.ApplicationCommand{ Name: "프롬프트재설정", Description: "프롬프트를 다시 불러와요.", }, - DetailedDescription: &DetailedDescription{ + DetailedDescription: &commands.DetailedDescription{ Usage: fmt.Sprintf("%s프롬프트재설정", configs.Config.Bot.Prefix), }, - Category: DeveloperOnly, + Category: commands.DeveloperOnly, RegisterApplicationCommand: false, RegisterMessageCommand: true, - Flags: CommandFlagsIsDeveloper, - MessageRun: func(ctx *MsgContext) error { + Flags: commands.CommandFlagsIsDeveloper, + MessageRun: func(ctx *commands.MsgContext) error { err := chatbot.ChatBot.ReloadPrompt() if err != nil { return err diff --git a/commands/devSwitchMode.go b/commands/dev/switchMode.go similarity index 69% rename from commands/devSwitchMode.go rename to commands/dev/switchMode.go index 60dd5b3..dbdf688 100644 --- a/commands/devSwitchMode.go +++ b/commands/dev/switchMode.go @@ -1,27 +1,28 @@ -package commands +package dev import ( "fmt" "git.wh64.net/muffin/goMuffin/chatbot" + "git.wh64.net/muffin/goMuffin/commands" "git.wh64.net/muffin/goMuffin/configs" "git.wh64.net/muffin/goMuffin/utils" "github.com/bwmarrin/discordgo" ) -var SwitchModeCommand *Command = &Command{ +var SwitchModeCommand *commands.Command = &commands.Command{ ApplicationCommand: &discordgo.ApplicationCommand{ Name: "모드전환", Description: "머핀봇의 대답을 변경합니다.", }, - DetailedDescription: &DetailedDescription{ + DetailedDescription: &commands.DetailedDescription{ Usage: fmt.Sprintf("%s모드전환", configs.Config.Bot.Prefix), }, - Category: DeveloperOnly, + Category: commands.DeveloperOnly, RegisterApplicationCommand: false, RegisterMessageCommand: true, - Flags: CommandFlagsIsDeveloper, - MessageRun: func(ctx *MsgContext) error { + Flags: commands.CommandFlagsIsDeveloper, + MessageRun: func(ctx *commands.MsgContext) error { chatbot.ChatBot.SwitchMode() return utils.NewMessageSender(ctx.Msg). diff --git a/commands/devUnblock.go b/commands/dev/unblock.go similarity index 80% rename from commands/devUnblock.go rename to commands/dev/unblock.go index 132028c..6e2a9c9 100644 --- a/commands/devUnblock.go +++ b/commands/dev/unblock.go @@ -1,9 +1,10 @@ -package commands +package dev import ( "context" "fmt" + "git.wh64.net/muffin/goMuffin/commands" "git.wh64.net/muffin/goMuffin/configs" "git.wh64.net/muffin/goMuffin/databases" "git.wh64.net/muffin/goMuffin/utils" @@ -11,19 +12,19 @@ import ( "go.mongodb.org/mongo-driver/v2/bson" ) -var UnblockCommand *Command = &Command{ +var UnblockCommand *commands.Command = &commands.Command{ ApplicationCommand: &discordgo.ApplicationCommand{ Name: "차단해제", Description: "유저의 차단을 해제해요.", }, - DetailedDescription: &DetailedDescription{ + DetailedDescription: &commands.DetailedDescription{ Usage: fmt.Sprintf("%s차단해제 (유저의 ID)", configs.Config.Bot.Prefix), }, - Category: DeveloperOnly, + Category: commands.DeveloperOnly, RegisterApplicationCommand: false, RegisterMessageCommand: true, - Flags: CommandFlagsIsDeveloper, - MessageRun: func(ctx *MsgContext) error { + Flags: commands.CommandFlagsIsDeveloper, + MessageRun: func(ctx *commands.MsgContext) error { if len(*ctx.Args) < 1 { utils.NewMessageSender(ctx.Msg). AddComponents(utils.GetErrorContainer(discordgo.TextDisplay{Content: "유저 ID는 필수에요."})). diff --git a/handler/interactionCreate.go b/handler/interactionCreate.go index ae58647..ac5df87 100644 --- a/handler/interactionCreate.go +++ b/handler/interactionCreate.go @@ -2,7 +2,6 @@ package handler import ( "fmt" - "log" "git.wh64.net/muffin/goMuffin/commands" "git.wh64.net/muffin/goMuffin/configs" @@ -32,7 +31,6 @@ func InteractionCreate(s *discordgo.Session, i *discordgo.InteractionCreate) { // 아 몰라 goto 쓸래 ErrMsg: - log.Println(err) owner, _ := s.User(configs.Config.Bot.OwnerId) utils.NewMessageSender(&utils.InteractionCreate{ InteractionCreate: i, diff --git a/main.go b/main.go index cf20638..743a899 100644 --- a/main.go +++ b/main.go @@ -11,6 +11,7 @@ import ( "git.wh64.net/muffin/goMuffin/chatbot" "git.wh64.net/muffin/goMuffin/commands" + "git.wh64.net/muffin/goMuffin/commands/dev" "git.wh64.net/muffin/goMuffin/components" "git.wh64.net/muffin/goMuffin/configs" "git.wh64.net/muffin/goMuffin/databases" @@ -29,13 +30,13 @@ func init() { go commands.Discommand.LoadCommand(commands.LearnedDataListCommand) go commands.Discommand.LoadCommand(commands.InformationCommand) go commands.Discommand.LoadCommand(commands.DeleteLearnedDataCommand) - go commands.Discommand.LoadCommand(commands.ReloadPromptCommand) - go commands.Discommand.LoadCommand(commands.SwitchModeCommand) + go commands.Discommand.LoadCommand(dev.ReloadPromptCommand) + go commands.Discommand.LoadCommand(dev.SwitchModeCommand) go commands.Discommand.LoadCommand(commands.ChatCommand) go commands.Discommand.LoadCommand(commands.RegisterCommand) go commands.Discommand.LoadCommand(commands.DeregisterCommand) - go commands.Discommand.LoadCommand(commands.BlockCommand) - go commands.Discommand.LoadCommand(commands.UnblockCommand) + go commands.Discommand.LoadCommand(dev.BlockCommand) + go commands.Discommand.LoadCommand(dev.UnblockCommand) go commands.Discommand.LoadComponent(components.DeleteLearnedDataComponent) go commands.Discommand.LoadComponent(components.PaginationEmbedComponent)