Merge branch 'main' into feat/xp-boost

1 files changed, 13 insertions, 11 deletions

diff --git a/commands/top.go b/commands/top.go
index daa1ccb..ecbf6f4 100644
--- a/commands/top.go
+++ b/commands/top.go
@@ -2,18 +2,20 @@ package commands
 
 import (
 	"fmt"
-	"github.com/anhgelus/gokord/utils"
-	"github.com/anhgelus/les-copaings-bot/config"
-	"github.com/anhgelus/les-copaings-bot/exp"
-	"github.com/anhgelus/les-copaings-bot/user"
-	"github.com/bwmarrin/discordgo"
 	"sync"
+
+	"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/cmd"
+	"github.com/anhgelus/gokord/logger"
+	discordgo "github.com/nyttikord/gokord"
 )
 
-func Top(s *discordgo.Session, i *discordgo.InteractionCreate, optMap utils.OptionMap, resp *utils.ResponseBuilder) {
+func Top(_ *discordgo.Session, i *discordgo.InteractionCreate, _ cmd.OptionMap, resp *cmd.ResponseBuilder) {
 	err := resp.IsDeferred().Send()
 	if err != nil {
-		utils.SendAlert("commands/top.go - Sending deferred", err.Error())
+		logger.Alert("commands/top.go - Sending deferred", err.Error())
 		return
 	}
 	embeds := make([]*discordgo.MessageEmbed, 3)
@@ -23,18 +25,18 @@ func Top(s *discordgo.Session, i *discordgo.InteractionCreate, optMap utils.Opti
 		defer wg.Done()
 		tops, err := user.GetBestXP(i.GuildID, n, d)
 		if err != nil {
-			utils.SendAlert("commands/top.go - Fetching best xp", err.Error(), "n", n, "d", d, "id", id, "guild_id", i.GuildID)
+			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,
 				Description: "Erreur : impossible de récupérer la liste",
-				Color:       utils.Error,
+				Color:       0x831010,
 			}
 			return
 		}
 		embeds[id] = &discordgo.MessageEmbed{
 			Title:       s,
 			Description: genTopsMessage(tops),
-			Color:       utils.Success,
+			Color:       0x10E6AD,
 		}
 	}
 	cfg := config.GetGuildConfig(i.GuildID)
@@ -57,7 +59,7 @@ func Top(s *discordgo.Session, i *discordgo.InteractionCreate, optMap utils.Opti
 		}
 		err = resp.Send()
 		if err != nil {
-			utils.SendAlert("commands/top.go - Sending response top", err.Error())
+			logger.Alert("commands/top.go - Sending response top", err.Error())
 		}
 	}()
 }