From 48eb4410ad14d74b3f1925d263b8fe32c472a648 Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Wed, 4 Jun 2025 15:11:16 +0200 Subject: [PATCH] build(gokord): upgrade to 0.10.0 --- commands/config.go | 23 +++++++++-------------- commands/credits.go | 9 ++++----- commands/rank.go | 4 +--- commands/reset.go | 9 ++++----- commands/top.go | 5 ++--- go.mod | 2 +- go.sum | 2 ++ 7 files changed, 23 insertions(+), 31 deletions(-) diff --git a/commands/config.go b/commands/config.go index 35d48be..48d7ab8 100644 --- a/commands/config.go +++ b/commands/config.go @@ -10,9 +10,8 @@ import ( "strings" ) -func ConfigShow(s *discordgo.Session, i *discordgo.InteractionCreate) { +func ConfigShow(s *discordgo.Session, i *discordgo.InteractionCreate, optMap utils.OptionMap, resp *utils.ResponseBuilder) { cfg := config.GetGuildConfig(i.GuildID) - resp := utils.NewResponseBuilder(s, i) roles := "" l := len(cfg.XpRoles) - 1 for i, r := range cfg.XpRoles { @@ -76,9 +75,8 @@ func ConfigShow(s *discordgo.Session, i *discordgo.InteractionCreate) { } } -func ConfigXP(s *discordgo.Session, i *discordgo.InteractionCreate) { - optMap := utils.GenerateOptionMapForSubcommand(i) - resp := utils.NewResponseBuilder(s, i).IsEphemeral() +func ConfigXP(s *discordgo.Session, i *discordgo.InteractionCreate, optMap utils.OptionMap, resp *utils.ResponseBuilder) { + resp.IsEphemeral() // verify every args t, ok := optMap["type"] if !ok { @@ -209,9 +207,8 @@ func ConfigXP(s *discordgo.Session, i *discordgo.InteractionCreate) { } } -func ConfigChannel(s *discordgo.Session, i *discordgo.InteractionCreate) { - optMap := utils.GenerateOptionMapForSubcommand(i) - resp := utils.NewResponseBuilder(s, i).IsEphemeral() +func ConfigChannel(s *discordgo.Session, i *discordgo.InteractionCreate, optMap utils.OptionMap, resp *utils.ResponseBuilder) { + resp.IsEphemeral() // verify every args t, ok := optMap["type"] if !ok { @@ -280,9 +277,8 @@ func ConfigChannel(s *discordgo.Session, i *discordgo.InteractionCreate) { } } -func ConfigFallbackChannel(s *discordgo.Session, i *discordgo.InteractionCreate) { - optMap := utils.GenerateOptionMapForSubcommand(i) - resp := utils.NewResponseBuilder(s, i).IsEphemeral() +func ConfigFallbackChannel(s *discordgo.Session, i *discordgo.InteractionCreate, optMap utils.OptionMap, resp *utils.ResponseBuilder) { + resp.IsEphemeral() // verify every args salon, ok := optMap["channel"] if !ok { @@ -322,9 +318,8 @@ func ConfigFallbackChannel(s *discordgo.Session, i *discordgo.InteractionCreate) } } -func ConfigPeriodBeforeReduce(s *discordgo.Session, i *discordgo.InteractionCreate) { - optMap := utils.GenerateOptionMapForSubcommand(i) - resp := utils.NewResponseBuilder(s, i).IsEphemeral() +func ConfigPeriodBeforeReduce(s *discordgo.Session, i *discordgo.InteractionCreate, optMap utils.OptionMap, resp *utils.ResponseBuilder) { + resp.IsEphemeral() // verify every args days, ok := optMap["days"] if !ok { diff --git a/commands/credits.go b/commands/credits.go index 1914950..0943761 100644 --- a/commands/credits.go +++ b/commands/credits.go @@ -5,8 +5,7 @@ import ( "github.com/bwmarrin/discordgo" ) -func Credits(s *discordgo.Session, i *discordgo.InteractionCreate) { - resp := utils.NewResponseBuilder(s, i) +func Credits(s *discordgo.Session, i *discordgo.InteractionCreate, optMap utils.OptionMap, resp *utils.ResponseBuilder) { err := resp.AddEmbed(&discordgo.MessageEmbed{ Type: discordgo.EmbedTypeRich, @@ -16,7 +15,7 @@ func Credits(s *discordgo.Session, i *discordgo.InteractionCreate) { Fields: []*discordgo.MessageEmbedField{ { Name: "anhgelus/gokord", - Value: "v0.9.0 - MPL 2.0", + Value: "v0.10.0 - MPL 2.0", Inline: true, }, { @@ -25,8 +24,8 @@ func Credits(s *discordgo.Session, i *discordgo.InteractionCreate) { Inline: true, }, { - Name: "redis/go-redis/v9", - Value: "v9.8.0 - BSD-2-Clause", + Name: "gorm", + Value: "v1.30.0 - MIT", Inline: true, }, }, diff --git a/commands/rank.go b/commands/rank.go index 293dae4..dd5859a 100644 --- a/commands/rank.go +++ b/commands/rank.go @@ -8,13 +8,11 @@ import ( "github.com/bwmarrin/discordgo" ) -func Rank(s *discordgo.Session, i *discordgo.InteractionCreate) { - optMap := utils.GenerateOptionMap(i) +func Rank(s *discordgo.Session, i *discordgo.InteractionCreate, optMap utils.OptionMap, resp *utils.ResponseBuilder) { c := user.GetCopaing(i.Member.User.ID, i.GuildID) // current user = member who used /rank msg := "Votre niveau" m := i.Member var err error - resp := utils.NewResponseBuilder(s, i) if v, ok := optMap["copaing"]; ok { u := v.UserValue(s) if u.Bot { diff --git a/commands/reset.go b/commands/reset.go index ba9367a..c4275a0 100644 --- a/commands/reset.go +++ b/commands/reset.go @@ -7,17 +7,16 @@ import ( "github.com/bwmarrin/discordgo" ) -func Reset(s *discordgo.Session, i *discordgo.InteractionCreate) { +func Reset(s *discordgo.Session, i *discordgo.InteractionCreate, optMap utils.OptionMap, resp *utils.ResponseBuilder) { var copaings []*user.Copaing gokord.DB.Where("guild_id = ?", i.GuildID).Delete(&copaings) - if err := utils.NewResponseBuilder(s, i).IsEphemeral().SetMessage("L'XP a été reset.").Send(); err != nil { + if err := resp.IsEphemeral().SetMessage("L'XP a été reset.").Send(); err != nil { utils.SendAlert("commands/reset.go - Sending success (all)", err.Error()) } } -func ResetUser(s *discordgo.Session, i *discordgo.InteractionCreate) { - resp := utils.NewResponseBuilder(s, i).IsEphemeral() - optMap := utils.GenerateOptionMap(i) +func ResetUser(s *discordgo.Session, i *discordgo.InteractionCreate, optMap utils.OptionMap, resp *utils.ResponseBuilder) { + resp.IsEphemeral() v, ok := optMap["user"] if !ok { if err := resp.SetMessage("Le user n'a pas été renseigné.").Send(); err != nil { diff --git a/commands/top.go b/commands/top.go index d0e898d..daa1ccb 100644 --- a/commands/top.go +++ b/commands/top.go @@ -10,9 +10,8 @@ import ( "sync" ) -func Top(s *discordgo.Session, i *discordgo.InteractionCreate) { - resp := utils.NewResponseBuilder(s, i).IsDeferred() - err := resp.Send() +func Top(s *discordgo.Session, i *discordgo.InteractionCreate, optMap utils.OptionMap, resp *utils.ResponseBuilder) { + err := resp.IsDeferred().Send() if err != nil { utils.SendAlert("commands/top.go - Sending deferred", err.Error()) return diff --git a/go.mod b/go.mod index 941d9a1..1321ae7 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/anhgelus/les-copaings-bot go 1.24 require ( - github.com/anhgelus/gokord v0.9.0 + github.com/anhgelus/gokord v0.10.0 github.com/bwmarrin/discordgo v0.29.0 github.com/pelletier/go-toml/v2 v2.2.4 gorm.io/driver/postgres v1.5.11 diff --git a/go.sum b/go.sum index 45ff634..fb058ce 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ github.com/anhgelus/gokord v0.7.0 h1:G9GrxD3/xEreXsiz3etKxbeHsNHrwT5I/VEKSWpyrj4 github.com/anhgelus/gokord v0.7.0/go.mod h1:SfGKyMMGjNS9F9ehiEb5Cc58P+uoDdLDGGYqXSiMCus= github.com/anhgelus/gokord v0.9.0 h1:vz7jHZ6papdt/xehe+nx4DxOLquPO6QukW8UzH81bGY= github.com/anhgelus/gokord v0.9.0/go.mod h1:NSepHjTV61LUnuyGgHxEhZNMnWREErGFyOtRYPgdx/E= +github.com/anhgelus/gokord v0.10.0 h1:FaaMWntaezmSCvarcSMjfWr5OXVVwwzlDMnNX8gXaWE= +github.com/anhgelus/gokord v0.10.0/go.mod h1:NSepHjTV61LUnuyGgHxEhZNMnWREErGFyOtRYPgdx/E= github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=