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

1 files changed, 11 insertions, 11 deletions

diff --git a/commands/reset.go b/commands/reset.go
index 07e3ba3..21bfeb7 100644
--- a/commands/reset.go
+++ b/commands/reset.go
@@ -4,43 +4,43 @@ import (
 	"git.anhgelus.world/anhgelus/les-copaings-bot/user"
 	"github.com/anhgelus/gokord"
 	"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 Reset(_ *discordgo.Session, i *discordgo.InteractionCreate, _ cmd.OptionMap, resp *cmd.ResponseBuilder) {
+func Reset(s bot.Session, i *event.InteractionCreate, _ cmd.OptionMap, resp *cmd.ResponseBuilder) {
 	var copaings []*user.Copaing
 	gokord.DB.Where("guild_id = ?", i.GuildID).Delete(&copaings)
 	if err := resp.IsEphemeral().SetMessage("L'XP a été reset.").Send(); err != nil {
-		logger.Alert("commands/reset.go - Sending success (all)", err.Error())
+		s.Logger().Error("sending reset success", "error", err)
 	}
 }
 
-func ResetUser(s *discordgo.Session, i *discordgo.InteractionCreate, optMap cmd.OptionMap, resp *cmd.ResponseBuilder) {
+func ResetUser(s bot.Session, i *event.InteractionCreate, optMap cmd.OptionMap, resp *cmd.ResponseBuilder) {
 	resp.IsEphemeral()
 	v, ok := optMap["user"]
 	if !ok {
 		if err := resp.SetMessage("Le user n'a pas été renseigné.").Send(); err != nil {
-			logger.Alert("commands/reset.go - Copaing not set", err.Error())
+			s.Logger().Error("sending error copaing not set", "error", err)
 		}
 		return
 	}
-	m := v.UserValue(s)
+	m := v.UserValue(s.UserAPI())
 	if m.Bot {
 		if err := resp.SetMessage("Les bots n'ont pas de niveau :upside_down:").Send(); err != nil {
-			logger.Alert("commands/reset.go - Copaing not set", err.Error())
+			s.Logger().Error("sending error bot does not have xp", "error", err)
 		}
 		return
 	}
 	err := user.GetCopaing(m.ID, i.GuildID).Delete()
 	if err != nil {
-		logger.Alert("commands/reset.go - Copaing not deleted", err.Error(), "discord_id", m.ID, "guild_id", i.GuildID)
+		s.Logger().Error("deleting copaing", "error", err, "user", m.Username, "guild", i.GuildID)
 		err = resp.SetMessage("Erreur : impossible de reset l'utilisateur").Send()
 		if err != nil {
-			logger.Alert("commands/reset.go - Error deleting", err.Error())
+			s.Logger().Error("sending error while deleting", "error", err)
 		}
 	}
 	if err = resp.SetMessage("Le user bien été reset.").Send(); err != nil {
-		logger.Alert("commands/reset.go - Sending success (user)", err.Error())
+		s.Logger().Error("sending reset success", "error", err)
 	}
 }