Merge pull request '[Refactor] Config command' (#1) from refactor/config-command into main

Reviewed-on: https://git.anhgelus.world/anhgelus/les-copaings-bot/pulls/1

3 files changed, 26 insertions, 25 deletions

diff --git a/user/level.go b/user/level.go
index 9ef7372..2b7e869 100644
--- a/user/level.go
+++ b/user/level.go
@@ -1,14 +1,15 @@
 package user
 
 import (
+	"slices"
+	"sync"
+	"time"
+
 	"github.com/anhgelus/gokord"
-	"github.com/anhgelus/gokord/utils"
+	"github.com/anhgelus/gokord/logger"
 	"github.com/anhgelus/les-copaings-bot/config"
 	"github.com/anhgelus/les-copaings-bot/exp"
 	"github.com/bwmarrin/discordgo"
-	"slices"
-	"sync"
-	"time"
 )
 
 func onNewLevel(dg *discordgo.Session, m *discordgo.Member, level uint) {
@@ -16,7 +17,7 @@ func onNewLevel(dg *discordgo.Session, m *discordgo.Member, level uint) {
 	xpForLevel := exp.LevelXP(level)
 	for _, role := range cfg.XpRoles {
 		if role.XP <= xpForLevel && !slices.Contains(m.Roles, role.RoleID) {
-			utils.SendDebug(
+			logger.Debug(
 				"Add role",
 				"role_id", role.RoleID,
 				"user_id", m.User.ID,
@@ -24,10 +25,10 @@ func onNewLevel(dg *discordgo.Session, m *discordgo.Member, level uint) {
 			)
 			err := dg.GuildMemberRoleAdd(m.GuildID, m.User.ID, role.RoleID)
 			if err != nil {
-				utils.SendAlert("user/level.go - Adding role", err.Error(), "role_id", role.RoleID)
+				logger.Alert("user/level.go - Adding role", err.Error(), "role_id", role.RoleID)
 			}
 		} else if role.XP > xpForLevel && slices.Contains(m.Roles, role.RoleID) {
-			utils.SendDebug(
+			logger.Debug(
 				"Remove role",
 				"role_id", role.RoleID,
 				"user_id", m.User.ID,
@@ -35,7 +36,7 @@ func onNewLevel(dg *discordgo.Session, m *discordgo.Member, level uint) {
 			)
 			err := dg.GuildMemberRoleRemove(m.GuildID, m.User.ID, role.RoleID)
 			if err != nil {
-				utils.SendAlert("user/level.go - Removing role", err.Error(), "role_id", role.RoleID)
+				logger.Alert("user/level.go - Removing role", err.Error(), "role_id", role.RoleID)
 			}
 		}
 	}
@@ -44,7 +45,7 @@ func onNewLevel(dg *discordgo.Session, m *discordgo.Member, level uint) {
 func (c *Copaing) OnNewLevel(dg *discordgo.Session, level uint) {
 	m, err := dg.GuildMember(c.GuildID, c.DiscordID)
 	if err != nil {
-		utils.SendAlert(
+		logger.Alert(
 			"user/level.go - Getting member for new level", err.Error(),
 			"discord_id", c.DiscordID,
 			"guild_id", c.GuildID,
@@ -58,7 +59,7 @@ func PeriodicReducer(dg *discordgo.Session) {
 	wg := &sync.WaitGroup{}
 	var cs []*Copaing
 	if err := gokord.DB.Find(&cs).Error; err != nil {
-		utils.SendAlert("user/level.go - Fetching all copaings", err.Error())
+		logger.Alert("user/level.go - Fetching all copaings", err.Error())
 		return
 	}
 	cxps := make([]*cXP, len(cs))
@@ -71,7 +72,7 @@ func PeriodicReducer(dg *discordgo.Session) {
 			defer wg.Done()
 			xp, err := c.GetXP()
 			if err != nil {
-				utils.SendAlert("user/level.go - Getting XP", err.Error(), "copaing_id", c.ID, "guild_id", c.GuildID)
+				logger.Alert("user/level.go - Getting XP", err.Error(), "copaing_id", c.ID, "guild_id", c.GuildID)
 				xp = 0
 			}
 			cxps[i] = &cXP{
@@ -91,26 +92,26 @@ func PeriodicReducer(dg *discordgo.Session) {
 				Where("guild_id = ? and created_at < ?", g.ID, exp.TimeStampNDaysBefore(cfg.DaysXPRemains)).
 				Delete(&CopaingXP{})
 			if res.Error != nil {
-				utils.SendAlert("user/level.go - Removing old XP", res.Error.Error(), "guild_id", g.ID)
+				logger.Alert("user/level.go - Removing old XP", res.Error.Error(), "guild_id", g.ID)
 			}
-			utils.SendDebug("Guild cleaned", "guild", g.Name, "rows affected", res.RowsAffected)
+			logger.Debug("Guild cleaned", "guild", g.Name, "rows affected", res.RowsAffected)
 		}()
 	}
 	wg.Wait()
 	for i, c := range cxps {
 		if i%50 == 49 {
-			utils.SendDebug("Sleeping...")
+			logger.Debug("Sleeping...")
 			time.Sleep(15 * time.Second) // prevents spamming the API
 		}
 		oldXp := c.GetXP()
 		xp, err := c.ToCopaing().GetXP()
 		if err != nil {
-			utils.SendAlert("user/level.go - Getting XP", err.Error(), "guild_id", c.ID, "discord_id", c.DiscordID)
+			logger.Alert("user/level.go - Getting XP", err.Error(), "guild_id", c.ID, "discord_id", c.DiscordID)
 			continue
 		}
 		if exp.Level(oldXp) != exp.Level(xp) {
 			c.OnNewLevel(dg, exp.Level(xp))
 		}
 	}
-	utils.SendDebug("Periodic reduce finished", "len(guilds)", len(dg.State.Guilds))
+	logger.Debug("Periodic reduce finished", "len(guilds)", len(dg.State.Guilds))
 }
diff --git a/user/member.go b/user/member.go
index 77ceb2e..a0e50fc 100644
--- a/user/member.go
+++ b/user/member.go
@@ -2,7 +2,7 @@ package user
 
 import (
 	"github.com/anhgelus/gokord"
-	"github.com/anhgelus/gokord/utils"
+	"github.com/anhgelus/gokord/logger"
 	"time"
 )
 
@@ -34,7 +34,7 @@ const (
 func GetCopaing(discordID string, guildID string) *Copaing {
 	c := Copaing{DiscordID: discordID, GuildID: guildID}
 	if err := c.Load(); err != nil {
-		utils.SendAlert(
+		logger.Alert(
 			"user/member.go - Loading user",
 			err.Error(),
 			"discord_id",
diff --git a/user/xp.go b/user/xp.go
index 71a1ced..c446977 100644
--- a/user/xp.go
+++ b/user/xp.go
@@ -2,7 +2,7 @@ package user
 
 import (
 	"github.com/anhgelus/gokord"
-	"github.com/anhgelus/gokord/utils"
+	"github.com/anhgelus/gokord/logger"
 	"github.com/anhgelus/les-copaings-bot/config"
 	"github.com/anhgelus/les-copaings-bot/exp"
 	"github.com/bwmarrin/discordgo"
@@ -26,14 +26,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)
+	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: xp, GuildID: c.GuildID})
 	if err = c.Save(); err != nil {
-		utils.SendAlert(
+		logger.Alert(
 			"user/xp.go - Saving user",
 			err.Error(),
 			"xp",
@@ -76,7 +76,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
@@ -103,7 +103,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)
@@ -111,7 +111,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})