From 8a7189c3835a431b7fc16b189162f6f343e80b84 Mon Sep 17 00:00:00 2001 From: ascpial Date: Sat, 20 Sep 2025 23:33:29 +0200 Subject: feat(config): finish upgrading config --- main.go | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'main.go') diff --git a/main.go b/main.go index b2fdf84..328b9b5 100644 --- a/main.go +++ b/main.go @@ -241,14 +241,8 @@ func main() { return } switch data.Values[0] { - case config.ModifyXpRole: - config.HandleXpRole(s, i, data, resp) - case config.ModifyFallbackChannel: - config.HandleModifyFallbackChannel(s, i, data, resp) case config.ModifyDisChannel: config.HandleModifyDisChannel(s, i, data, resp) - case config.ModifyTimeReduce: - config.HandleModifyPeriodicReduce(s, i, data, resp) default: bot.LogError(errors.New("unknown value"), "detecting value %s", data.Values[0]) return @@ -265,13 +259,23 @@ func main() { handleDynamicModalComponent(&bot, config.HandleXpRoleEditLevel, config.XpRoleEditLevelPattern) handleDynamicMessageComponent(&bot, config.HandleXpRoleDel, config.XpRoleDel) // channel related - bot.HandleMessageComponent(config.HandleFallbackChannelSet, config.FallbackChannelSet) - bot.HandleMessageComponent(config.HandleDisChannel, config.DisChannelAdd) - bot.HandleMessageComponent(config.HandleDisChannel, config.DisChannelDel) - bot.HandleMessageComponent(config.HandleDisChannelAddSet, config.DisChannelAddSet) - bot.HandleMessageComponent(config.HandleDisChannelDelSet, config.DisChannelDelSet) + bot.HandleMessageComponent(func(s *discordgo.Session, i *discordgo.InteractionCreate, data *interaction.MessageComponentData, resp *cmd.ResponseBuilder) { + if config.HandleModifyFallbackChannel(s, i, data, resp) { + commands.ConfigMessageComponent(s, i, data, resp) + } + }, config.ModifyFallbackChannel) + bot.HandleMessageComponent(func(s *discordgo.Session, i *discordgo.InteractionCreate, data *interaction.MessageComponentData, resp *cmd.ResponseBuilder) { + if config.HandleModifyDisChannel(s, i, data, resp) { + commands.ConfigMessageComponent(s, i, data, resp) + } + }, config.ModifyDisChannel) // reduce related - bot.HandleModal(config.HandleTimeReduceSet, config.TimeReduceSet) + bot.HandleMessageComponent(config.HandleModifyPeriodicReduceCommand, config.ModifyTimeReduce) + bot.HandleModal(func(s *discordgo.Session, i *discordgo.InteractionCreate, data *interaction.ModalSubmitData, resp *cmd.ResponseBuilder) { + if config.HandleTimeReduceSet(s, i, data, resp) { + commands.ConfigModal(s, i, data, resp) + } + }, config.TimeReduceSet) // xp handlers bot.AddHandler(OnMessage) -- cgit v1.2.3 From 1d4994286d9d787724110821077cbba993b4f94a Mon Sep 17 00:00:00 2001 From: ascpial Date: Sun, 21 Sep 2025 00:00:23 +0200 Subject: fix(config): remove useless code --- main.go | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'main.go') diff --git a/main.go b/main.go index 328b9b5..3b7495a 100644 --- a/main.go +++ b/main.go @@ -235,19 +235,6 @@ func main() { } // interaction: /config - bot.HandleMessageComponent(func(s *discordgo.Session, i *discordgo.InteractionCreate, data *interaction.MessageComponentData, resp *cmd.ResponseBuilder) { - if len(data.Values) != 1 { - bot.LogError(errors.New("invalid data values"), "handle config modify, values: %#v", data.Values) - return - } - switch data.Values[0] { - case config.ModifyDisChannel: - config.HandleModifyDisChannel(s, i, data, resp) - default: - bot.LogError(errors.New("unknown value"), "detecting value %s", data.Values[0]) - return - } - }, commands.ConfigModify) bot.HandleMessageComponent(commands.ConfigMessageComponent, commands.OpenConfig) // xp role related bot.HandleMessageComponent(config.HandleXpRole, config.ModifyXpRole) -- cgit v1.2.3