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

1 files changed, 21 insertions, 20 deletions

diff --git a/user/xp.go b/user/xp.go
index 606598c..6b0f6cc 100644
--- a/user/xp.go
+++ b/user/xp.go
@@ -1,6 +1,7 @@
 package user
 
 import (
+	"log/slog"
 	"math"
 	"slices"
 	"sync"
@@ -8,8 +9,8 @@ import (
 	"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"
+	"github.com/nyttikord/gokord/bot"
+	"github.com/nyttikord/gokord/user"
 )
 
 type cXP struct {
@@ -25,19 +26,19 @@ func (c *cXP) GetXP() uint {
 	return c.Cxp
 }
 
-func (c *Copaing) AddXP(s *discordgo.Session, m *discordgo.Member, xp uint, fn func(uint, uint)) {
-	old, err := c.GetXP()
+func (c *Copaing) AddXP(s bot.Session, m *user.Member, xp uint, fn func(uint, uint)) {
+	old, err := c.GetXP(s.Logger())
 	if err != nil {
-		logger.Alert("user/xp.go - Getting xp", err.Error(), "discord_id", c.DiscordID, "guild_id", c.GuildID)
+		s.Logger().Error("getting xp", "error", err, "user", m.DisplayName(), "guild", c.GuildID)
 		return
 	}
 	pastLevel := exp.Level(old)
-	logger.Debug("Adding xp", "member", m.DisplayName(), "old xp", old, "xp to add", xp, "old level", pastLevel)
+	s.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 {
-		logger.Alert(
-			"user/xp.go - Saving user",
-			err.Error(),
+		s.Logger().Error(
+			"saving user",
+			"error", err.Error(),
 			"xp", c.CopaingXPs,
 			"discord_id", c.DiscordID,
 			"guild_id", c.GuildID,
@@ -51,12 +52,12 @@ func (c *Copaing) AddXP(s *discordgo.Session, m *discordgo.Member, xp uint, fn f
 	}
 }
 
-func (c *Copaing) GetXP() (uint, error) {
+func (c *Copaing) GetXP(logger *slog.Logger) (uint, error) {
 	cfg := config.GetGuildConfig(c.GuildID)
-	return c.GetXPForDays(cfg.DaysXPRemains)
+	return c.GetXPForDays(logger, cfg.DaysXPRemains)
 }
 
-func (c *Copaing) GetXPForDays(n uint) (uint, error) {
+func (c *Copaing) GetXPForDays(logger *slog.Logger, n uint) (uint, error) {
 	xp := uint(0)
 	rows, err := gokord.DB.
 		Model(&CopaingXP{}).
@@ -67,15 +68,15 @@ func (c *Copaing) GetXPForDays(n uint) (uint, error) {
 			c.ID,
 		).
 		Rows()
-	defer rows.Close()
 	if err != nil {
 		return 0, err
 	}
+	defer rows.Close()
 	for rows.Next() {
 		var cxp CopaingXP
 		err = gokord.DB.ScanRows(rows, &cxp)
 		if err != nil {
-			logger.Alert("user/xp.go - Scanning rows", err.Error(), "copaing_id", c.ID, "guild_id", c.GuildID)
+			logger.Error("scanning rows", "error", err, "copaing", c.ID, "guild", c.GuildID)
 			continue
 		}
 		xp += cxp.XP
@@ -83,7 +84,7 @@ func (c *Copaing) GetXPForDays(n uint) (uint, error) {
 	return xp, nil
 }
 
-func (c *Copaing) GetBoost(m *discordgo.Member) float64 {
+func (c *Copaing) GetBoost(m *user.Member) float64 {
 	boost := 1.0
 	if m.PremiumSince != nil {
 		boost = max(boost, 2.0)
@@ -103,31 +104,31 @@ func (c *Copaing) GetBoost(m *discordgo.Member) float64 {
 // GetBestXP returns n Copaing with the best XP within d days (d <= cfg.DaysXPRemain; d < 0 <=> d = cfg.DaysXPRemain)
 //
 // This function is slow
-func GetBestXP(guildId string, n uint, d int) ([]CopaingAccess, error) {
+func GetBestXP(logger *slog.Logger, guildId string, n uint, d int) ([]CopaingAccess, error) {
 	if d < 0 {
 		cfg := config.GetGuildConfig(guildId)
 		d = int(cfg.DaysXPRemains)
 	}
 	rows, err := gokord.DB.Model(&Copaing{}).Where("guild_id = ?", guildId).Rows()
-	defer rows.Close()
 	if err != nil {
 		return nil, err
 	}
+	defer rows.Close()
 	var l []*cXP
 	wg := sync.WaitGroup{}
 	for rows.Next() {
 		var c Copaing
 		err = gokord.DB.ScanRows(rows, &c)
 		if err != nil {
-			logger.Alert("user/xp.go - Scanning rows", err.Error(), "guild_id", guildId)
+			logger.Error("scanning rows", "error", err, "copaing", c.ID, "guild", c.GuildID)
 			continue
 		}
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			xp, err := c.GetXPForDays(uint(d))
+			xp, err := c.GetXPForDays(logger, uint(d))
 			if err != nil {
-				logger.Alert("user/xp.go - Fetching xp", err.Error(), "discord_id", c.DiscordID, "guild_id", guildId)
+				logger.Error("fetching xp", "error", err, "copaing", c.ID, "guild", c.GuildID)
 				return
 			}
 			l = append(l, &cXP{Cxp: xp, Copaing: &c})