Merge branch 'main' into feat/xp-boost

1 files changed, 13 insertions, 16 deletions

diff --git a/user/xp.go b/user/xp.go
index 6dbed59..feb9cf7 100644
--- a/user/xp.go
+++ b/user/xp.go
@@ -1,14 +1,15 @@
 package user
 
 import (
-	"github.com/anhgelus/gokord"
-	"github.com/anhgelus/gokord/utils"
-	"github.com/anhgelus/les-copaings-bot/config"
-	"github.com/anhgelus/les-copaings-bot/exp"
-	"github.com/bwmarrin/discordgo"
 	"math"
 	"slices"
 	"sync"
+
+	"git.anhgelus.world/anhgelus/les-copaings-bot/config"
+	"git.anhgelus.world/anhgelus/les-copaings-bot/exp"
+	"github.com/anhgelus/gokord"
+	"github.com/anhgelus/gokord/logger"
+	discordgo "github.com/nyttikord/gokord"
 )
 
 type cXP struct {
@@ -27,18 +28,14 @@ func (c *cXP) GetXP() uint {
 func (c *Copaing) AddXP(s *discordgo.Session, m *discordgo.Member, xp uint, fn func(uint, uint)) {
 	old, err := c.GetXP()
 	if err != nil {
-		utils.SendAlert("user/xp.go - Getting xp", err.Error(), "discord_id", c.DiscordID, "guild_id", c.GuildID)
+		logger.Alert("user/xp.go - Getting xp", err.Error(), "discord_id", c.DiscordID, "guild_id", c.GuildID)
 		return
 	}
 	pastLevel := exp.Level(old)
-	utils.SendDebug("Adding xp", "member", m.DisplayName(), "old xp", old, "xp to add", xp, "old level", pastLevel)
-	c.CopaingXPs = append(c.CopaingXPs, CopaingXP{
-		CopaingID: c.ID,
-		XP:        uint(math.Floor(float64(xp) * c.GetBoost(m))),
-		GuildID:   c.GuildID,
-	})
+	logger.Debug("Adding xp", "member", m.DisplayName(), "old xp", old, "xp to add", xp, "old level", pastLevel)
+	c.CopaingXPs = append(c.CopaingXPs, CopaingXP{CopaingID: c.ID, XP: uint(math.Floor(float64(xp) * c.GetBoost(m))), GuildID: c.GuildID})
 	if err = c.Save(); err != nil {
-		utils.SendAlert(
+		logger.Alert(
 			"user/xp.go - Saving user",
 			err.Error(),
 			"xp", c.CopaingXPs,
@@ -78,7 +75,7 @@ func (c *Copaing) GetXPForDays(n uint) (uint, error) {
 		var cxp CopaingXP
 		err = gokord.DB.ScanRows(rows, &cxp)
 		if err != nil {
-			utils.SendAlert("user/xp.go - Scanning rows", err.Error(), "copaing_id", c.ID, "guild_id", c.GuildID)
+			logger.Alert("user/xp.go - Scanning rows", err.Error(), "copaing_id", c.ID, "guild_id", c.GuildID)
 			continue
 		}
 		xp += cxp.XP
@@ -119,7 +116,7 @@ func GetBestXP(guildId string, n uint, d int) ([]CopaingAccess, error) {
 		var c Copaing
 		err = gokord.DB.ScanRows(rows, &c)
 		if err != nil {
-			utils.SendAlert("user/xp.go - Scanning rows", err.Error(), "guild_id", guildId)
+			logger.Alert("user/xp.go - Scanning rows", err.Error(), "guild_id", guildId)
 			continue
 		}
 		wg.Add(1)
@@ -127,7 +124,7 @@ func GetBestXP(guildId string, n uint, d int) ([]CopaingAccess, error) {
 			defer wg.Done()
 			xp, err := c.GetXPForDays(uint(d))
 			if err != nil {
-				utils.SendAlert("user/xp.go - Fetching xp", err.Error(), "discord_id", c.DiscordID, "guild_id", guildId)
+				logger.Alert("user/xp.go - Fetching xp", err.Error(), "discord_id", c.DiscordID, "guild_id", guildId)
 				return
 			}
 			l = append(l, &cXP{Cxp: xp, Copaing: &c})