Merge branch 'main' into feat/xp-boostfeat/xp-boost

1 files changed, 13 insertions, 26 deletions

diff --git a/commands/rank.go b/commands/rank.go
index 94dabf2..4080864 100644
--- a/commands/rank.go
+++ b/commands/rank.go
@@ -6,55 +6,42 @@ 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"
+	"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
 	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())
+				s.Logger().Error("reply error user is a bot", "error", err)
 			}
+			return
 		}
-		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",
-				err.Error(),
-				"discord_id",
-				u.ID,
-				"guild_id",
-				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 {
-				logger.Alert("commands/rank.go - Reply error fetching guild member", err.Error())
+				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 {
-		logger.Alert(
-			"commands/rank.go - Fetching xp",
-			err.Error(),
-			"discord_id",
-			c.ID,
-			"guild_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 {
-			logger.Alert("commands/rank.go - Reply error fetching xp", err.Error())
+			s.Logger().Error("reply error fetching xp", "error", err)
 		}
 		return
 	}
@@ -68,6 +55,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.Logger().Error("sending rank", "error", err)
 	}
 }