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

1 files changed, 14 insertions, 13 deletions

diff --git a/commands/top.go b/commands/top.go
index ecbf6f4..bb08144 100644
--- a/commands/top.go
+++ b/commands/top.go
@@ -8,33 +8,34 @@ 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/channel"
+	"github.com/nyttikord/gokord/event"
 )
 
-func Top(_ *discordgo.Session, i *discordgo.InteractionCreate, _ cmd.OptionMap, resp *cmd.ResponseBuilder) {
+func Top(s bot.Session, i *event.InteractionCreate, _ cmd.OptionMap, resp *cmd.ResponseBuilder) {
 	err := resp.IsDeferred().Send()
 	if err != nil {
-		logger.Alert("commands/top.go - Sending deferred", err.Error())
+		s.Logger().Error("sending deferred", "error", err)
 		return
 	}
-	embeds := make([]*discordgo.MessageEmbed, 3)
+	embeds := make([]*channel.MessageEmbed, 3)
 	wg := sync.WaitGroup{}
 
-	fn := func(s string, n uint, d int, id int) {
+	fn := func(str string, n uint, d int, id int) {
 		defer wg.Done()
-		tops, err := user.GetBestXP(i.GuildID, n, d)
+		tops, err := user.GetBestXP(s.Logger(), i.GuildID, n, d)
 		if err != nil {
-			logger.Alert("commands/top.go - Fetching best xp", err.Error(), "n", n, "d", d, "id", id, "guild_id", i.GuildID)
-			embeds[id] = &discordgo.MessageEmbed{
-				Title:       s,
+			s.Logger().Error("fetching best xp", "error", err, "n", n, "d", d, "id", id, "guild", i.GuildID)
+			embeds[id] = &channel.MessageEmbed{
+				Title:       str,
 				Description: "Erreur : impossible de récupérer la liste",
 				Color:       0x831010,
 			}
 			return
 		}
-		embeds[id] = &discordgo.MessageEmbed{
-			Title:       s,
+		embeds[id] = &channel.MessageEmbed{
+			Title:       str,
 			Description: genTopsMessage(tops),
 			Color:       0x10E6AD,
 		}
@@ -59,7 +60,7 @@ func Top(_ *discordgo.Session, i *discordgo.InteractionCreate, _ cmd.OptionMap,
 		}
 		err = resp.Send()
 		if err != nil {
-			logger.Alert("commands/top.go - Sending response top", err.Error())
+			s.Logger().Error("sending response top", "error", err)
 		}
 	}()
 }