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

1 files changed, 40 insertions, 39 deletions

diff --git a/user/level.go b/user/level.go
index be7d212..4303b47 100644
--- a/user/level.go
+++ b/user/level.go
@@ -8,71 +8,70 @@ 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"
 )
 
-func onNewLevel(dg *discordgo.Session, m *discordgo.Member, level uint) {
+func onNewLevel(s bot.Session, m *user.Member, level uint) {
 	cfg := config.GetGuildConfig(m.GuildID)
 	xpForLevel := exp.LevelXP(level)
 	for _, role := range cfg.XpRoles {
 		if role.XP <= xpForLevel && !slices.Contains(m.Roles, role.RoleID) {
-			logger.Debug(
-				"Add role",
-				"role_id", role.RoleID,
-				"user_id", m.User.ID,
-				"guild_id", m.GuildID,
-			)
-			err := dg.GuildMemberRoleAdd(m.GuildID, m.User.ID, role.RoleID)
+			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 {
-				logger.Alert("user/level.go - Adding role", err.Error(), "role_id", role.RoleID)
+				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) {
-			logger.Debug(
-				"Remove role",
-				"role_id", role.RoleID,
-				"user_id", m.User.ID,
-				"guild_id", m.GuildID,
-			)
-			err := dg.GuildMemberRoleRemove(m.GuildID, m.User.ID, role.RoleID)
+			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 {
-				logger.Alert("user/level.go - Removing role", err.Error(), "role_id", role.RoleID)
+				s.Logger().Error(
+					"removing role",
+					"error", err,
+					"role", role.RoleID,
+					"user", m.DisplayName(),
+					"guild", m.GuildID,
+				)
 			}
 		}
 	}
 }
 
-func (c *Copaing) OnNewLevel(dg *discordgo.Session, level uint) {
-	m, err := dg.GuildMember(c.GuildID, c.DiscordID)
+func (c *Copaing) OnNewLevel(s *discordgo.Session, level uint) {
+	m, err := s.GuildAPI().Member(c.GuildID, c.DiscordID)
 	if err != nil {
-		logger.Alert(
-			"user/level.go - Getting member for new level", err.Error(),
-			"discord_id", c.DiscordID,
-			"guild_id", c.GuildID,
-		)
+		s.Logger().Error("getting member for new level", "error", err, "user", c.DiscordID, "guild", c.GuildID)
 		return
 	}
-	onNewLevel(dg, m, level)
+	onNewLevel(s, m, level)
 }
 
-func PeriodicReducer(dg *discordgo.Session) {
+func PeriodicReducer(s *discordgo.Session) {
 	wg := &sync.WaitGroup{}
 	var cs []*Copaing
 	if err := gokord.DB.Find(&cs).Error; err != nil {
-		logger.Alert("user/level.go - Fetching all copaings", err.Error())
+		s.Logger().Error("fetching all copaings", "error", err)
 		return
 	}
 	cxps := make([]*cXP, len(cs))
 	for i, c := range cs {
-		if i%10 == 9 {
+		if i%25 == 24 {
 			wg.Wait() // prevents spamming the DB
 		}
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			xp, err := c.GetXP()
+			xp, err := c.GetXP(s.Logger())
 			if err != nil {
-				logger.Alert("user/level.go - Getting XP", err.Error(), "copaing_id", c.ID, "guild_id", c.GuildID)
+				s.Logger().Error("getting xp", "error", err, "copaing", c.ID, "guild", c.GuildID)
 				xp = 0
 			}
 			cxps[i] = &cXP{
@@ -82,7 +81,9 @@ func PeriodicReducer(dg *discordgo.Session) {
 		}()
 	}
 	wg.Wait()
-	for _, g := range dg.State.Guilds {
+	i := 0
+	for g := range s.GuildAPI().State.Guilds() {
+		i++
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
@@ -92,26 +93,26 @@ func PeriodicReducer(dg *discordgo.Session) {
 				Where("guild_id = ? and created_at < ?", g.ID, exp.TimeStampNDaysBefore(cfg.DaysXPRemains)).
 				Delete(&CopaingXP{})
 			if res.Error != nil {
-				logger.Alert("user/level.go - Removing old XP", res.Error.Error(), "guild_id", g.ID)
+				s.Logger().Error("removing old xp", "error", res.Error, "guild", g.ID)
 			}
-			logger.Debug("Guild cleaned", "guild", g.Name, "rows affected", 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 {
-			logger.Debug("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 {
-			logger.Alert("user/level.go - Getting XP", err.Error(), "guild_id", c.ID, "discord_id", c.DiscordID)
+			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(dg, exp.Level(xp))
+			c.OnNewLevel(s, exp.Level(xp))
 		}
 	}
-	logger.Debug("Periodic reduce finished", "len(guilds)", len(dg.State.Guilds))
+	s.Logger().Debug("periodic reduce finished", "guilds affected", i)
 }