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 --- commands/rank.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'commands/rank.go') diff --git a/commands/rank.go b/commands/rank.go index 94dabf2..0adfde6 100644 --- a/commands/rank.go +++ b/commands/rank.go @@ -16,14 +16,14 @@ func Rank(s *discordgo.Session, i *discordgo.InteractionCreate, optMap cmd.Optio m := i.Member var err error if v, ok := optMap["copaing"]; ok { - u := v.UserValue(s) + u := v.UserValue(s.UserAPI()) if u.Bot { err = resp.SetMessage("Imagine si les bots avaient un niveau :rolling_eyes:").IsEphemeral().Send() if err != nil { logger.Alert("commands/rank.go - Reply error user is a bot", err.Error()) } } - m, err = s.GuildMember(i.GuildID, u.ID) + m, err = s.GuildAPI().Member(i.GuildID, u.ID) if err != nil { logger.Alert( "commands/rank.go - Fetching guild member", -- 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 --- commands/rank.go | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) (limited to 'commands/rank.go') diff --git a/commands/rank.go b/commands/rank.go index 0adfde6..d3a9f70 100644 --- a/commands/rank.go +++ b/commands/rank.go @@ -6,7 +6,6 @@ import ( "git.anhgelus.world/anhgelus/les-copaings-bot/exp" "git.anhgelus.world/anhgelus/les-copaings-bot/user" "github.com/anhgelus/gokord/cmd" - "github.com/anhgelus/gokord/logger" discordgo "github.com/nyttikord/gokord" ) @@ -20,22 +19,16 @@ func Rank(s *discordgo.Session, i *discordgo.InteractionCreate, optMap cmd.Optio if u.Bot { err = resp.SetMessage("Imagine si les bots avaient un niveau :rolling_eyes:").IsEphemeral().Send() if err != nil { - logger.Alert("commands/rank.go - Reply error user is a bot", err.Error()) + s.LogError(err, "reply error user is a bot") } + return } m, err = s.GuildAPI().Member(i.GuildID, u.ID) if err != nil { - logger.Alert( - "commands/rank.go - Fetching guild member", - err.Error(), - "discord_id", - u.ID, - "guild_id", - i.GuildID, - ) + s.LogError(err, "Fetching guild member %s in %s", u.Username, i.GuildID) err = resp.SetMessage("Erreur : impossible de récupérer le membre").IsEphemeral().Send() if err != nil { - logger.Alert("commands/rank.go - Reply error fetching guild member", err.Error()) + s.LogError(err, "reply error fetching guild member") } return } @@ -44,17 +37,10 @@ func Rank(s *discordgo.Session, i *discordgo.InteractionCreate, optMap cmd.Optio } xp, err := c.GetXP() if err != nil { - logger.Alert( - "commands/rank.go - Fetching xp", - err.Error(), - "discord_id", - c.ID, - "guild_id", - i.GuildID, - ) + s.LogError(err, "fetching xp for copaing %s in %s", c.ID, i.GuildID) err = resp.SetMessage("Erreur : impossible de récupérer l'XP").IsEphemeral().Send() if err != nil { - logger.Alert("commands/rank.go - Reply error fetching xp", err.Error()) + s.LogError(err, "reply error fetching xp") } return } @@ -68,6 +54,6 @@ func Rank(s *discordgo.Session, i *discordgo.InteractionCreate, optMap cmd.Optio nxtLvlXP-xp, )).Send() if err != nil { - logger.Alert("commands/rank.go - Sending rank", err.Error()) + s.LogError(err, "sending rank") } } -- 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 --- commands/rank.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'commands/rank.go') diff --git a/commands/rank.go b/commands/rank.go index d3a9f70..8f3090f 100644 --- a/commands/rank.go +++ b/commands/rank.go @@ -6,10 +6,11 @@ import ( "git.anhgelus.world/anhgelus/les-copaings-bot/exp" "git.anhgelus.world/anhgelus/les-copaings-bot/user" "github.com/anhgelus/gokord/cmd" - discordgo "github.com/nyttikord/gokord" + "github.com/nyttikord/gokord/bot" + "github.com/nyttikord/gokord/event" ) -func Rank(s *discordgo.Session, i *discordgo.InteractionCreate, optMap cmd.OptionMap, resp *cmd.ResponseBuilder) { +func Rank(s bot.Session, i *event.InteractionCreate, optMap cmd.OptionMap, resp *cmd.ResponseBuilder) { c := user.GetCopaing(i.Member.User.ID, i.GuildID) // current user = member who used /rank msg := "Votre niveau" m := i.Member -- 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 --- commands/rank.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'commands/rank.go') diff --git a/commands/rank.go b/commands/rank.go index 8f3090f..4080864 100644 --- a/commands/rank.go +++ b/commands/rank.go @@ -20,28 +20,28 @@ func Rank(s bot.Session, i *event.InteractionCreate, optMap cmd.OptionMap, resp if u.Bot { err = resp.SetMessage("Imagine si les bots avaient un niveau :rolling_eyes:").IsEphemeral().Send() if err != nil { - s.LogError(err, "reply error user is a bot") + s.Logger().Error("reply error user is a bot", "error", err) } return } m, err = s.GuildAPI().Member(i.GuildID, u.ID) if err != nil { - s.LogError(err, "Fetching guild member %s in %s", u.Username, i.GuildID) + s.Logger().Error("fetching guild member", "error", err, "user", u.Username, "guild", i.GuildID) err = resp.SetMessage("Erreur : impossible de récupérer le membre").IsEphemeral().Send() if err != nil { - s.LogError(err, "reply error fetching guild member") + s.Logger().Error("reply error fetching guild member", "error", err) } return } c = user.GetCopaing(u.ID, i.GuildID) // current user = member targeted by member who wrote /rank msg = fmt.Sprintf("Le niveau de %s", m.DisplayName()) } - xp, err := c.GetXP() + xp, err := c.GetXP(s.Logger()) if err != nil { - s.LogError(err, "fetching xp for copaing %s in %s", c.ID, i.GuildID) + s.Logger().Error("fetching xp", "error", err, "copaing", c.ID, "guild", i.GuildID) err = resp.SetMessage("Erreur : impossible de récupérer l'XP").IsEphemeral().Send() if err != nil { - s.LogError(err, "reply error fetching xp") + s.Logger().Error("reply error fetching xp", "error", err) } return } @@ -55,6 +55,6 @@ func Rank(s bot.Session, i *event.InteractionCreate, optMap cmd.OptionMap, resp nxtLvlXP-xp, )).Send() if err != nil { - s.LogError(err, "sending rank") + s.Logger().Error("sending rank", "error", err) } } -- cgit v1.2.3