build(gokord): bump to latest nightly

2 files changed, 39 insertions, 27 deletions

diff --git a/user/level.go b/user/level.go
index 88971e6..4303b47 100644
--- a/user/level.go
+++ b/user/level.go
@@ -18,16 +18,28 @@ func onNewLevel(s bot.Session, m *user.Member, level uint) {
 	xpForLevel := exp.LevelXP(level)
 	for _, role := range cfg.XpRoles {
 		if role.XP <= xpForLevel && !slices.Contains(m.Roles, role.RoleID) {
-			s.LogDebug("add role %s to %s in %s", role.RoleID, m.DisplayName(), m.GuildID)
+			s.Logger().Debug("add role", "role", role.RoleID, "user", m.DisplayName(), "guild", m.GuildID)
 			err := s.GuildAPI().MemberRoleAdd(m.GuildID, m.User.ID, role.RoleID)
 			if err != nil {
-				s.LogError(err, "adding role %s to %s in %s", role.RoleID, m.DisplayName(), m.GuildID)
+				s.Logger().Error(
+					"adding role",
+					"error", err,
+					"role", role.RoleID,
+					"user", m.DisplayName(),
+					"guild", m.GuildID,
+				)
 			}
 		} else if role.XP > xpForLevel && slices.Contains(m.Roles, role.RoleID) {
-			s.LogDebug("remove role %s to %s in %s", role.RoleID, m.DisplayName(), m.GuildID)
+			s.Logger().Debug("remove role", "role", role.RoleID, "user", m.DisplayName(), "guild", m.GuildID)
 			err := s.GuildAPI().MemberRoleRemove(m.GuildID, m.User.ID, role.RoleID)
 			if err != nil {
-				s.LogError(err, "removing role s to %s in %s", role.RoleID, m.DisplayName(), m.GuildID)
+				s.Logger().Error(
+					"removing role",
+					"error", err,
+					"role", role.RoleID,
+					"user", m.DisplayName(),
+					"guild", m.GuildID,
+				)
 			}
 		}
 	}
@@ -36,7 +48,7 @@ func onNewLevel(s bot.Session, m *user.Member, level uint) {
 func (c *Copaing) OnNewLevel(s *discordgo.Session, level uint) {
 	m, err := s.GuildAPI().Member(c.GuildID, c.DiscordID)
 	if err != nil {
-		s.LogError(err, "getting member %s in %s for new level", c.DiscordID, c.GuildID)
+		s.Logger().Error("getting member for new level", "error", err, "user", c.DiscordID, "guild", c.GuildID)
 		return
 	}
 	onNewLevel(s, m, level)
@@ -46,7 +58,7 @@ func PeriodicReducer(s *discordgo.Session) {
 	wg := &sync.WaitGroup{}
 	var cs []*Copaing
 	if err := gokord.DB.Find(&cs).Error; err != nil {
-		s.LogError(err, "fetching all copaings")
+		s.Logger().Error("fetching all copaings", "error", err)
 		return
 	}
 	cxps := make([]*cXP, len(cs))
@@ -57,9 +69,9 @@ func PeriodicReducer(s *discordgo.Session) {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			xp, err := c.GetXP()
+			xp, err := c.GetXP(s.Logger())
 			if err != nil {
-				s.LogError(err, "getting xp of copaing %d in %s", c.ID, c.GuildID)
+				s.Logger().Error("getting xp", "error", err, "copaing", c.ID, "guild", c.GuildID)
 				xp = 0
 			}
 			cxps[i] = &cXP{
@@ -81,26 +93,26 @@ func PeriodicReducer(s *discordgo.Session) {
 				Where("guild_id = ? and created_at < ?", g.ID, exp.TimeStampNDaysBefore(cfg.DaysXPRemains)).
 				Delete(&CopaingXP{})
 			if res.Error != nil {
-				s.LogError(res.Error, "removing old xp in %s", g.ID)
+				s.Logger().Error("removing old xp", "error", res.Error, "guild", g.ID)
 			}
-			s.LogDebug("Guild cleaned %s, rows affected: %d", g.Name, res.RowsAffected)
+			s.Logger().Debug("guild cleaned", "guild", g.Name, "rows affected", res.RowsAffected)
 		}()
 	}
 	wg.Wait()
 	for i, c := range cxps {
 		if i%50 == 49 {
-			s.LogDebug("Sleeping...")
+			s.Logger().Debug("sleeping...")
 			time.Sleep(15 * time.Second) // prevents spamming the API
 		}
 		oldXp := c.GetXP()
-		xp, err := c.ToCopaing().GetXP()
+		xp, err := c.ToCopaing().GetXP(s.Logger())
 		if err != nil {
-			s.LogError(err, "getting xp of copaing %s in %s", c.ID, c.GuildID)
+			s.Logger().Error("getting xp of copaing", "error", err, "copaing", c.ID, "guild", c.GuildID)
 			continue
 		}
 		if exp.Level(oldXp) != exp.Level(xp) {
 			c.OnNewLevel(s, exp.Level(xp))
 		}
 	}
-	s.LogDebug("Periodic reduce finished for %d guilds", i)
+	s.Logger().Debug("periodic reduce finished", "guilds affected", i)
 }
diff --git a/user/xp.go b/user/xp.go
index 16ba0ad..dbca9de 100644
--- a/user/xp.go
+++ b/user/xp.go
@@ -1,6 +1,7 @@
 package user
 
 import (
+	"log/slog"
 	"slices"
 	"sync"
 
@@ -8,7 +9,6 @@ import (
 	"git.anhgelus.world/anhgelus/les-copaings-bot/exp"
 	"github.com/anhgelus/gokord"
 	"github.com/nyttikord/gokord/bot"
-	"github.com/nyttikord/gokord/logger"
 	"github.com/nyttikord/gokord/user"
 )
 
@@ -26,16 +26,16 @@ func (c *cXP) GetXP() uint {
 }
 
 func (c *Copaing) AddXP(s bot.Session, m *user.Member, xp uint, fn func(uint, uint)) {
-	old, err := c.GetXP()
+	old, err := c.GetXP(s.Logger())
 	if err != nil {
-		s.LogError(err, "getting xp for %s in %s", m.DisplayName(), c.GuildID)
+		s.Logger().Error("getting xp", "error", err, "user", m.DisplayName(), "guild", c.GuildID)
 		return
 	}
 	pastLevel := exp.Level(old)
-	s.LogDebug("Adding xp to %s, old: %d, to add: %d", m.DisplayName(), old, xp)
+	s.Logger().Debug("adding xp", "user", m.DisplayName(), "old", old, "to add", xp)
 	c.CopaingXPs = append(c.CopaingXPs, CopaingXP{CopaingID: c.ID, XP: xp, GuildID: c.GuildID})
 	if err = c.Save(); err != nil {
-		s.LogError(err, "saving user %s with xp %d in %s", m.DisplayName(), xp, c.GuildID)
+		s.Logger().Error("saving user", "error", err, "user", m.DisplayName(), "xp", xp, "guild", c.GuildID)
 		return
 	}
 	newLevel := exp.Level(old + xp)
@@ -45,12 +45,12 @@ func (c *Copaing) AddXP(s bot.Session, m *user.Member, xp uint, fn func(uint, ui
 	}
 }
 
-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{}).
@@ -69,7 +69,7 @@ func (c *Copaing) GetXPForDays(n uint) (uint, error) {
 		var cxp CopaingXP
 		err = gokord.DB.ScanRows(rows, &cxp)
 		if err != nil {
-			logger.Log(logger.LevelError, 0, "scanning rows of copaing %d in %s: %#v", c.ID, c.GuildID, err.Error())
+			logger.Error("scanning rows", "error", err, "copaing", c.ID, "guild", c.GuildID)
 			continue
 		}
 		xp += cxp.XP
@@ -80,7 +80,7 @@ func (c *Copaing) GetXPForDays(n uint) (uint, error) {
 // 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)
@@ -96,15 +96,15 @@ func GetBestXP(guildId string, n uint, d int) ([]CopaingAccess, error) {
 		var c Copaing
 		err = gokord.DB.ScanRows(rows, &c)
 		if err != nil {
-			logger.Log(logger.LevelError, 0, "scanning rows of copaing %d in %s: %#v", c.ID, c.GuildID, err.Error())
+			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.Log(logger.LevelError, 0, "fetching xp of copaing %d in %s: %#v", c.ID, c.GuildID, err.Error())
+				logger.Error("fetching xp", "error", err, "copaing", c.ID, "guild", c.GuildID)
 				return
 			}
 			l = append(l, &cXP{Cxp: xp, Copaing: &c})