From 83d07520ac4a3e2a82d11435ca5af4e24fea1a7c Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Thu, 11 Sep 2025 13:43:07 +0200 Subject: build(gokord): upgrade to latest nightly --- main.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'main.go') diff --git a/main.go b/main.go index facf243..71f31b5 100644 --- a/main.go +++ b/main.go @@ -68,7 +68,7 @@ func main() { topCmd := cmd.New("top", "Copaings les plus actifs"). SetHandler(commands.Top) - resetCmd := cmd.New("reset", "Reset l'xp"). + /*resetCmd := cmd.New("reset", "Reset l'xp"). SetHandler(commands.Reset). SetPermission(&adm) @@ -82,7 +82,7 @@ func main() { SetPermission(&adm) creditsCmd := cmd.New("credits", "Crédits"). - SetHandler(commands.Credits) + SetHandler(commands.Credits)*/ statsCmd := cmd.New("stats", "Affiche des stats :D"). AddOption(cmd.NewOption( @@ -126,9 +126,9 @@ func main() { rankCmd, configCmd, topCmd, - resetCmd, + /*resetCmd, resetUserCmd, - creditsCmd, + creditsCmd,*/ statsCmd, }, AfterInit: func(dg *discordgo.Session) { -- cgit v1.2.3 From f9b2367fe3e75b9d26a0c7c87bbfb85e9606a2c8 Mon Sep 17 00:00:00 2001 From: ascpial Date: Thu, 11 Sep 2025 14:21:26 +0200 Subject: feat(stats): nicer font in stats graph --- main.go | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'main.go') diff --git a/main.go b/main.go index 71f31b5..b529193 100644 --- a/main.go +++ b/main.go @@ -15,6 +15,9 @@ import ( "github.com/anhgelus/gokord/logger" "github.com/joho/godotenv" discordgo "github.com/nyttikord/gokord" + "golang.org/x/image/font/opentype" + "gonum.org/v1/plot" + "gonum.org/v1/plot/font" ) var ( @@ -30,12 +33,31 @@ var ( stopPeriodicReducer chan<- interface{} ) +//go:embed assets/inter-variable.ttf +var interTTF []byte + func init() { err := godotenv.Load() if err != nil && !errors.Is(err, os.ErrNotExist) { logger.Warn("Error while loading .env file", "error", err.Error()) } flag.StringVar(&token, "token", os.Getenv("TOKEN"), "token of the bot") + + // Use a nicer font + fontTTF, parseErr := opentype.Parse(interTTF) + if parseErr != nil { + panic(err) + } + inter := font.Font{Typeface: "Inter"} + font.DefaultCache.Add( + []font.Face{ + { + Font: inter, + Face: fontTTF, + }, + }) + plot.DefaultFont = inter + } func main() { -- cgit v1.2.3 From a7d95c1248631058754445e8b487bd6b17c003e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Herg=C3=A8s?= Date: Thu, 11 Sep 2025 23:36:35 +0200 Subject: fix(commands): some were wrongly disabled --- main.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'main.go') diff --git a/main.go b/main.go index b529193..3d32389 100644 --- a/main.go +++ b/main.go @@ -90,7 +90,7 @@ func main() { topCmd := cmd.New("top", "Copaings les plus actifs"). SetHandler(commands.Top) - /*resetCmd := cmd.New("reset", "Reset l'xp"). + resetCmd := cmd.New("reset", "Reset l'xp"). SetHandler(commands.Reset). SetPermission(&adm) @@ -104,7 +104,7 @@ func main() { SetPermission(&adm) creditsCmd := cmd.New("credits", "Crédits"). - SetHandler(commands.Credits)*/ + SetHandler(commands.Credits) statsCmd := cmd.New("stats", "Affiche des stats :D"). AddOption(cmd.NewOption( @@ -148,9 +148,9 @@ func main() { rankCmd, configCmd, topCmd, - /*resetCmd, + resetCmd, resetUserCmd, - creditsCmd,*/ + creditsCmd, statsCmd, }, AfterInit: func(dg *discordgo.Session) { -- cgit v1.2.3 From 8885566932c965926ee64fad6404e6f26bc13220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Herg=C3=A8s?= Date: Sat, 13 Sep 2025 13:32:01 +0200 Subject: build(gokord): upgrade to latest version --- main.go | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'main.go') diff --git a/main.go b/main.go index 3d32389..7db4893 100644 --- a/main.go +++ b/main.go @@ -15,6 +15,9 @@ import ( "github.com/anhgelus/gokord/logger" "github.com/joho/godotenv" discordgo "github.com/nyttikord/gokord" + "github.com/nyttikord/gokord/discord" + "github.com/nyttikord/gokord/discord/types" + "github.com/nyttikord/gokord/interaction" "golang.org/x/image/font/opentype" "gonum.org/v1/plot" "gonum.org/v1/plot/font" @@ -77,7 +80,7 @@ func main() { rankCmd := cmd.New("rank", "Affiche le niveau d'un copaing"). AddOption(cmd.NewOption( - discordgo.ApplicationCommandOptionUser, + types.CommandOptionUser, "copaing", "Le niveau du Copaing que vous souhaitez obtenir", )). @@ -96,7 +99,7 @@ func main() { resetUserCmd := cmd.New("reset-user", "Reset l'xp d'un utilisation"). AddOption(cmd.NewOption( - discordgo.ApplicationCommandOptionUser, + types.CommandOptionUser, "user", "Copaing a reset", ).IsRequired()). @@ -108,12 +111,12 @@ func main() { statsCmd := cmd.New("stats", "Affiche des stats :D"). AddOption(cmd.NewOption( - discordgo.ApplicationCommandOptionInteger, + types.CommandOptionInteger, "days", "Nombre de jours à afficher dans le graphique", )). AddOption(cmd.NewOption( - discordgo.ApplicationCommandOptionUser, + types.CommandOptionUser, "user", "Utilisateur à inspecter", )). @@ -168,13 +171,13 @@ func main() { }, Innovations: innovations, Version: &Version, - Intents: discordgo.IntentsAllWithoutPrivileged | - discordgo.IntentsMessageContent | - discordgo.IntentGuildMembers, + Intents: discord.IntentsAllWithoutPrivileged | + discord.IntentsMessageContent | + discord.IntentGuildMembers, } // interaction: /config - bot.HandleMessageComponent(func(s *discordgo.Session, i *discordgo.InteractionCreate, data discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) { + bot.HandleMessageComponent(func(s *discordgo.Session, i *discordgo.InteractionCreate, data interaction.MessageComponentData, resp *cmd.ResponseBuilder) { if len(data.Values) != 1 { logger.Alert("main.go - Handle config modify", "invalid data values", "values", data.Values) return -- cgit v1.2.3 From e42ecdd7154d740800ef392c6318220944b55a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Herg=C3=A8s?= Date: Sat, 13 Sep 2025 21:31:16 +0200 Subject: build(gokord): use latest version --- main.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'main.go') diff --git a/main.go b/main.go index 7db4893..7be2e68 100644 --- a/main.go +++ b/main.go @@ -12,12 +12,12 @@ import ( "git.anhgelus.world/anhgelus/les-copaings-bot/user" "github.com/anhgelus/gokord" "github.com/anhgelus/gokord/cmd" - "github.com/anhgelus/gokord/logger" "github.com/joho/godotenv" discordgo "github.com/nyttikord/gokord" "github.com/nyttikord/gokord/discord" "github.com/nyttikord/gokord/discord/types" "github.com/nyttikord/gokord/interaction" + "github.com/nyttikord/gokord/logger" "golang.org/x/image/font/opentype" "gonum.org/v1/plot" "gonum.org/v1/plot/font" @@ -42,7 +42,7 @@ var interTTF []byte func init() { err := godotenv.Load() if err != nil && !errors.Is(err, os.ErrNotExist) { - logger.Warn("Error while loading .env file", "error", err.Error()) + logger.Log(logger.LevelError, 0, "Error while loading .env file: %v", err.Error()) } flag.StringVar(&token, "token", os.Getenv("TOKEN"), "token of the bot") @@ -165,7 +165,7 @@ func main() { user.PeriodicReducer(dg) stopPeriodicReducer = gokord.NewTimer(d, func(stop chan<- interface{}) { - logger.Debug("Periodic reducer") + dg.LogDebug("Periodic reducer") user.PeriodicReducer(dg) }) }, @@ -179,7 +179,7 @@ func main() { // interaction: /config bot.HandleMessageComponent(func(s *discordgo.Session, i *discordgo.InteractionCreate, data interaction.MessageComponentData, resp *cmd.ResponseBuilder) { if len(data.Values) != 1 { - logger.Alert("main.go - Handle config modify", "invalid data values", "values", data.Values) + bot.LogError(errors.New("invalid data values"), "handle config modify, values: %#v", data.Values) return } switch data.Values[0] { @@ -192,7 +192,7 @@ func main() { case config.ModifyTimeReduce: config.HandleModifyPeriodicReduce(s, i, data, resp) default: - logger.Alert("main.go - Detecting value", "unkown value", "value", data.Values[0]) + bot.LogError(errors.New("unknown value"), "detecting value %s", data.Values[0]) return } }, commands.ConfigModify) -- cgit v1.2.3 From 24519b76b48f521f1ef4c7e5e038574eaa66ebcd Mon Sep 17 00:00:00 2001 From: ascpial Date: Sat, 13 Sep 2025 21:40:24 +0200 Subject: feat(config): improve /config look and xp_role usability --- main.go | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 68 insertions(+), 10 deletions(-) (limited to 'main.go') diff --git a/main.go b/main.go index 7be2e68..f6ccf5f 100644 --- a/main.go +++ b/main.go @@ -2,9 +2,11 @@ package main import ( _ "embed" + "encoding/json" "errors" "flag" "os" + "regexp" "time" "git.anhgelus.world/anhgelus/les-copaings-bot/commands" @@ -63,6 +65,61 @@ func init() { } +func handleDynamicMessageComponent( + b *gokord.Bot, + handler func( + *discordgo.Session, + *discordgo.InteractionCreate, + interaction.MessageComponentData, + []string, *cmd.ResponseBuilder, + ), + pattern string, +) { + compiledPattern := regexp.MustCompile(pattern) + b.AddHandler(func(s *discordgo.Session, i *discordgo.InteractionCreate) { + if i.Type != types.InteractionMessageComponent { + return + } + + data := i.MessageComponentData() + parameters := compiledPattern.FindStringSubmatch(data.CustomID) + if parameters == nil { + return + } + parameters = parameters[1:] + handler(s, i, data, parameters, cmd.NewResponseBuilder(s, i)) + }) +} + +func handleDynamicModalComponent( + b *gokord.Bot, + handler func( + *discordgo.Session, + *discordgo.InteractionCreate, + interaction.ModalSubmitData, + []string, + *cmd.ResponseBuilder, + ), + pattern string, +) { + compiledPattern := regexp.MustCompile(pattern) + b.AddHandler(func(s *discordgo.Session, i *discordgo.InteractionCreate) { + if i.Type != types.InteractionModalSubmit { + return + } + + data := i.ModalSubmitData() + content, _ := json.Marshal(data) + s.LogDebug(string(content)) + parameters := compiledPattern.FindStringSubmatch(data.CustomID) + if parameters == nil { + return + } + parameters = parameters[1:] + handler(s, i, data, parameters, cmd.NewResponseBuilder(s, i)) + }) +} + func main() { flag.Parse() gokord.UseRedis = false @@ -88,7 +145,7 @@ func main() { configCmd := cmd.New("config", "Modifie la config"). SetPermission(&adm). - SetHandler(commands.Config) + SetHandler(commands.ConfigCommand) topCmd := cmd.New("top", "Copaings les plus actifs"). SetHandler(commands.Top) @@ -184,7 +241,7 @@ func main() { } switch data.Values[0] { case config.ModifyXpRole: - config.HandleModifyXpRole(s, i, data, resp) + config.HandleXpRole(s, i, data, resp) case config.ModifyFallbackChannel: config.HandleModifyFallbackChannel(s, i, data, resp) case config.ModifyDisChannel: @@ -196,15 +253,16 @@ func main() { return } }, commands.ConfigModify) + bot.HandleMessageComponent(commands.ConfigMessageComponent, commands.OpenConfig) // xp role related - bot.HandleMessageComponent(config.HandleXpRoleAddEdit, config.XpRoleAdd) - bot.HandleMessageComponent(config.HandleXpRoleAddEdit, config.XpRoleEdit) - bot.HandleMessageComponent(config.HandleXpRoleAddRole, config.XpRoleAddRole) - bot.HandleMessageComponent(config.HandleXpRoleEditRole, config.XpRoleEditRole) - bot.HandleMessageComponent(config.HandleXpRoleDel, config.XpRoleDel) - bot.HandleMessageComponent(config.HandleXpRoleDelRole, config.XpRoleDelRole) - bot.HandleModal(config.HandleXpRoleLevel, config.XpRoleAddLevel) - bot.HandleModal(config.HandleXpRoleLevel, config.XpRoleEditLevel) + bot.HandleMessageComponent(config.HandleXpRole, config.ModifyXpRole) + bot.HandleMessageComponent(config.HandleXpRoleNew, config.XpRoleNew) + bot.HandleModal(config.HandleXpRoleAdd, config.XpRoleAdd) + handleDynamicMessageComponent(&bot, config.HandleXpRoleEdit, config.XpRoleEditPattern) + handleDynamicMessageComponent(&bot, config.HandleXpRoleEditRole, config.XpRoleEditRolePattern) + handleDynamicMessageComponent(&bot, config.HandleXpRoleEditLevelStart, config.XpRoleEditLevelStartPattern) + 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) -- cgit v1.2.3 From 9d1ea00a2f7436ddddfad6b739adc0f433ecf9cd Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Thu, 18 Sep 2025 19:25:06 +0200 Subject: build(gokord): upgrade to latest nightly --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main.go') diff --git a/main.go b/main.go index f6ccf5f..3bca23e 100644 --- a/main.go +++ b/main.go @@ -96,7 +96,7 @@ func handleDynamicModalComponent( handler func( *discordgo.Session, *discordgo.InteractionCreate, - interaction.ModalSubmitData, + *interaction.ModalSubmitData, []string, *cmd.ResponseBuilder, ), -- cgit v1.2.3 From 398213f2088b775787d4c022b5704366fdfe1aa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Herg=C3=A8s?= Date: Fri, 19 Sep 2025 18:42:07 +0200 Subject: build(gokord): bump to latest nightly --- main.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'main.go') diff --git a/main.go b/main.go index 3bca23e..ff8c55a 100644 --- a/main.go +++ b/main.go @@ -68,11 +68,11 @@ func init() { func handleDynamicMessageComponent( b *gokord.Bot, handler func( - *discordgo.Session, - *discordgo.InteractionCreate, - interaction.MessageComponentData, - []string, *cmd.ResponseBuilder, - ), + *discordgo.Session, + *discordgo.InteractionCreate, + *interaction.MessageComponentData, + []string, *cmd.ResponseBuilder, +), pattern string, ) { compiledPattern := regexp.MustCompile(pattern) @@ -94,12 +94,12 @@ func handleDynamicMessageComponent( func handleDynamicModalComponent( b *gokord.Bot, handler func( - *discordgo.Session, - *discordgo.InteractionCreate, - *interaction.ModalSubmitData, - []string, - *cmd.ResponseBuilder, - ), + *discordgo.Session, + *discordgo.InteractionCreate, + *interaction.ModalSubmitData, + []string, + *cmd.ResponseBuilder, +), pattern string, ) { compiledPattern := regexp.MustCompile(pattern) @@ -110,7 +110,7 @@ func handleDynamicModalComponent( data := i.ModalSubmitData() content, _ := json.Marshal(data) - s.LogDebug(string(content)) + s.LogDebug("%s", content) parameters := compiledPattern.FindStringSubmatch(data.CustomID) if parameters == nil { return @@ -234,7 +234,7 @@ func main() { } // interaction: /config - bot.HandleMessageComponent(func(s *discordgo.Session, i *discordgo.InteractionCreate, data interaction.MessageComponentData, resp *cmd.ResponseBuilder) { + 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 -- cgit v1.2.3 From e8b91140fba414c2bd7e7f36e8cff95d7651732d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Herg=C3=A8s?= Date: Sat, 20 Sep 2025 13:40:41 +0200 Subject: fix(db): closing rows even if rows is nil --- main.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'main.go') diff --git a/main.go b/main.go index ff8c55a..e313c17 100644 --- a/main.go +++ b/main.go @@ -68,11 +68,11 @@ func init() { func handleDynamicMessageComponent( b *gokord.Bot, handler func( - *discordgo.Session, - *discordgo.InteractionCreate, - *interaction.MessageComponentData, - []string, *cmd.ResponseBuilder, -), + *discordgo.Session, + *discordgo.InteractionCreate, + *interaction.MessageComponentData, + []string, *cmd.ResponseBuilder, + ), pattern string, ) { compiledPattern := regexp.MustCompile(pattern) @@ -94,12 +94,12 @@ func handleDynamicMessageComponent( func handleDynamicModalComponent( b *gokord.Bot, handler func( - *discordgo.Session, - *discordgo.InteractionCreate, - *interaction.ModalSubmitData, - []string, - *cmd.ResponseBuilder, -), + *discordgo.Session, + *discordgo.InteractionCreate, + *interaction.ModalSubmitData, + []string, + *cmd.ResponseBuilder, + ), pattern string, ) { compiledPattern := regexp.MustCompile(pattern) -- cgit v1.2.3 From a0e93b4e031857e7379e2ab2d7bdae24561f4e5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Herg=C3=A8s?= Date: Sat, 20 Sep 2025 15:39:51 +0200 Subject: feat(stats): better style for the graph --- main.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'main.go') diff --git a/main.go b/main.go index e313c17..b2fdf84 100644 --- a/main.go +++ b/main.go @@ -11,6 +11,7 @@ import ( "git.anhgelus.world/anhgelus/les-copaings-bot/commands" "git.anhgelus.world/anhgelus/les-copaings-bot/config" + "git.anhgelus.world/anhgelus/les-copaings-bot/exp" "git.anhgelus.world/anhgelus/les-copaings-bot/user" "github.com/anhgelus/gokord" "github.com/anhgelus/gokord/cmd" @@ -216,7 +217,7 @@ func main() { AfterInit: func(dg *discordgo.Session) { d := 24 * time.Hour if gokord.Debug { - d = 24 * time.Second + d = 3 * exp.DebugFactor * time.Second } user.PeriodicReducer(dg) -- cgit v1.2.3 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 From b61a834b608df3d5e617912eefb28924ef3a46df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Herg=C3=A8s?= Date: Fri, 26 Sep 2025 18:30:57 +0200 Subject: build(gokord): bump to latest nightly --- main.go | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) (limited to 'main.go') diff --git a/main.go b/main.go index 3b7495a..f1555f0 100644 --- a/main.go +++ b/main.go @@ -17,8 +17,10 @@ import ( "github.com/anhgelus/gokord/cmd" "github.com/joho/godotenv" discordgo "github.com/nyttikord/gokord" + "github.com/nyttikord/gokord/bot" "github.com/nyttikord/gokord/discord" "github.com/nyttikord/gokord/discord/types" + "github.com/nyttikord/gokord/event" "github.com/nyttikord/gokord/interaction" "github.com/nyttikord/gokord/logger" "golang.org/x/image/font/opentype" @@ -69,15 +71,15 @@ func init() { func handleDynamicMessageComponent( b *gokord.Bot, handler func( - *discordgo.Session, - *discordgo.InteractionCreate, + bot.Session, + *event.InteractionCreate, *interaction.MessageComponentData, []string, *cmd.ResponseBuilder, ), pattern string, ) { compiledPattern := regexp.MustCompile(pattern) - b.AddHandler(func(s *discordgo.Session, i *discordgo.InteractionCreate) { + b.AddHandler(func(s bot.Session, i *event.InteractionCreate) { if i.Type != types.InteractionMessageComponent { return } @@ -95,8 +97,8 @@ func handleDynamicMessageComponent( func handleDynamicModalComponent( b *gokord.Bot, handler func( - *discordgo.Session, - *discordgo.InteractionCreate, + bot.Session, + *event.InteractionCreate, *interaction.ModalSubmitData, []string, *cmd.ResponseBuilder, @@ -104,7 +106,7 @@ func handleDynamicModalComponent( pattern string, ) { compiledPattern := regexp.MustCompile(pattern) - b.AddHandler(func(s *discordgo.Session, i *discordgo.InteractionCreate) { + b.AddHandler(func(s bot.Session, i *event.InteractionCreate) { if i.Type != types.InteractionModalSubmit { return } @@ -185,7 +187,7 @@ func main() { panic(err) } - bot := gokord.Bot{ + b := gokord.Bot{ Token: token, Status: []*gokord.Status{ { @@ -235,41 +237,41 @@ func main() { } // interaction: /config - bot.HandleMessageComponent(commands.ConfigMessageComponent, commands.OpenConfig) + b.HandleMessageComponent(commands.ConfigMessageComponent, commands.OpenConfig) // xp role related - bot.HandleMessageComponent(config.HandleXpRole, config.ModifyXpRole) - bot.HandleMessageComponent(config.HandleXpRoleNew, config.XpRoleNew) - bot.HandleModal(config.HandleXpRoleAdd, config.XpRoleAdd) - handleDynamicMessageComponent(&bot, config.HandleXpRoleEdit, config.XpRoleEditPattern) - handleDynamicMessageComponent(&bot, config.HandleXpRoleEditRole, config.XpRoleEditRolePattern) - handleDynamicMessageComponent(&bot, config.HandleXpRoleEditLevelStart, config.XpRoleEditLevelStartPattern) - handleDynamicModalComponent(&bot, config.HandleXpRoleEditLevel, config.XpRoleEditLevelPattern) - handleDynamicMessageComponent(&bot, config.HandleXpRoleDel, config.XpRoleDel) + b.HandleMessageComponent(config.HandleXpRole, config.ModifyXpRole) + b.HandleMessageComponent(config.HandleXpRoleNew, config.XpRoleNew) + b.HandleModal(config.HandleXpRoleAdd, config.XpRoleAdd) + handleDynamicMessageComponent(&b, config.HandleXpRoleEdit, config.XpRoleEditPattern) + handleDynamicMessageComponent(&b, config.HandleXpRoleEditRole, config.XpRoleEditRolePattern) + handleDynamicMessageComponent(&b, config.HandleXpRoleEditLevelStart, config.XpRoleEditLevelStartPattern) + handleDynamicModalComponent(&b, config.HandleXpRoleEditLevel, config.XpRoleEditLevelPattern) + handleDynamicMessageComponent(&b, config.HandleXpRoleDel, config.XpRoleDel) // channel related - bot.HandleMessageComponent(func(s *discordgo.Session, i *discordgo.InteractionCreate, data *interaction.MessageComponentData, resp *cmd.ResponseBuilder) { + b.HandleMessageComponent(func(s bot.Session, i *event.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) { + b.HandleMessageComponent(func(s bot.Session, i *event.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.HandleMessageComponent(config.HandleModifyPeriodicReduceCommand, config.ModifyTimeReduce) - bot.HandleModal(func(s *discordgo.Session, i *discordgo.InteractionCreate, data *interaction.ModalSubmitData, resp *cmd.ResponseBuilder) { + b.HandleMessageComponent(config.HandleModifyPeriodicReduceCommand, config.ModifyTimeReduce) + b.HandleModal(func(s bot.Session, i *event.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) - bot.AddHandler(OnVoiceUpdate) - bot.AddHandler(OnLeave) + b.AddHandler(OnMessage) + b.AddHandler(OnVoiceUpdate) + b.AddHandler(OnLeave) - bot.Start() + b.Start() if stopPeriodicReducer != nil { stopPeriodicReducer <- true -- cgit v1.2.3 From cfdba5f417bb31aac564d13becc09874f17d075d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Herg=C3=A8s?= Date: Sat, 27 Sep 2025 17:34:38 +0200 Subject: build(gokord): bump to latest nightly --- main.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'main.go') diff --git a/main.go b/main.go index f1555f0..56753e1 100644 --- a/main.go +++ b/main.go @@ -5,6 +5,7 @@ import ( "encoding/json" "errors" "flag" + "log/slog" "os" "regexp" "time" @@ -22,7 +23,6 @@ import ( "github.com/nyttikord/gokord/discord/types" "github.com/nyttikord/gokord/event" "github.com/nyttikord/gokord/interaction" - "github.com/nyttikord/gokord/logger" "golang.org/x/image/font/opentype" "gonum.org/v1/plot" "gonum.org/v1/plot/font" @@ -47,7 +47,7 @@ var interTTF []byte func init() { err := godotenv.Load() if err != nil && !errors.Is(err, os.ErrNotExist) { - logger.Log(logger.LevelError, 0, "Error while loading .env file: %v", err.Error()) + slog.Error("error while loading .env file", "error", err) } flag.StringVar(&token, "token", os.Getenv("TOKEN"), "token of the bot") @@ -113,7 +113,7 @@ func handleDynamicModalComponent( data := i.ModalSubmitData() content, _ := json.Marshal(data) - s.LogDebug("%s", content) + s.Logger().Debug(string(content)) parameters := compiledPattern.FindStringSubmatch(data.CustomID) if parameters == nil { return @@ -225,7 +225,7 @@ func main() { user.PeriodicReducer(dg) stopPeriodicReducer = gokord.NewTimer(d, func(stop chan<- interface{}) { - dg.LogDebug("Periodic reducer") + dg.Logger().Debug("periodic reducer") user.PeriodicReducer(dg) }) }, -- cgit v1.2.3