From ad8f65fec5c7e1e0ec0b3d4e992ffc67a0357661 Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Thu, 11 Sep 2025 12:58:03 +0200 Subject: feat(db): remove xp when copaing leaves --- user/level.go | 2 +- user/member.go | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'user') diff --git a/user/level.go b/user/level.go index be7d212..cf4d99b 100644 --- a/user/level.go +++ b/user/level.go @@ -64,7 +64,7 @@ func PeriodicReducer(dg *discordgo.Session) { } 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) diff --git a/user/member.go b/user/member.go index ad8762f..9068a6f 100644 --- a/user/member.go +++ b/user/member.go @@ -26,11 +26,6 @@ type CopaingAccess interface { GetXP() uint } -const ( - LastEvent = "last_event" - AlreadyRemoved = "already_removed" -) - func GetCopaing(discordID string, guildID string) *Copaing { c := Copaing{DiscordID: discordID, GuildID: guildID} if err := c.Load(); err != nil { -- cgit v1.2.3 From 8885566932c965926ee64fad6404e6f26bc13220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Herg=C3=A8s?= Date: Sat, 13 Sep 2025 13:32:01 +0200 Subject: build(gokord): upgrade to latest version --- user/level.go | 9 +++++---- user/xp.go | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'user') diff --git a/user/level.go b/user/level.go index cf4d99b..6f92ce7 100644 --- a/user/level.go +++ b/user/level.go @@ -10,9 +10,10 @@ import ( "github.com/anhgelus/gokord" "github.com/anhgelus/gokord/logger" discordgo "github.com/nyttikord/gokord" + "github.com/nyttikord/gokord/user" ) -func onNewLevel(dg *discordgo.Session, m *discordgo.Member, level uint) { +func onNewLevel(dg *discordgo.Session, m *user.Member, level uint) { cfg := config.GetGuildConfig(m.GuildID) xpForLevel := exp.LevelXP(level) for _, role := range cfg.XpRoles { @@ -23,7 +24,7 @@ func onNewLevel(dg *discordgo.Session, m *discordgo.Member, level uint) { "user_id", m.User.ID, "guild_id", m.GuildID, ) - err := dg.GuildMemberRoleAdd(m.GuildID, m.User.ID, role.RoleID) + err := dg.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) } @@ -34,7 +35,7 @@ func onNewLevel(dg *discordgo.Session, m *discordgo.Member, level uint) { "user_id", m.User.ID, "guild_id", m.GuildID, ) - err := dg.GuildMemberRoleRemove(m.GuildID, m.User.ID, role.RoleID) + err := dg.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) } @@ -43,7 +44,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) + m, err := dg.GuildAPI().Member(c.GuildID, c.DiscordID) if err != nil { logger.Alert( "user/level.go - Getting member for new level", err.Error(), diff --git a/user/xp.go b/user/xp.go index 45080ea..550f3bf 100644 --- a/user/xp.go +++ b/user/xp.go @@ -9,6 +9,7 @@ import ( "github.com/anhgelus/gokord" "github.com/anhgelus/gokord/logger" discordgo "github.com/nyttikord/gokord" + "github.com/nyttikord/gokord/user" ) type cXP struct { @@ -24,7 +25,7 @@ func (c *cXP) GetXP() uint { return c.Cxp } -func (c *Copaing) AddXP(s *discordgo.Session, m *discordgo.Member, xp uint, fn func(uint, uint)) { +func (c *Copaing) AddXP(s *discordgo.Session, m *user.Member, xp uint, fn func(uint, uint)) { old, err := c.GetXP() if err != nil { logger.Alert("user/xp.go - Getting xp", err.Error(), "discord_id", c.DiscordID, "guild_id", c.GuildID) -- cgit v1.2.3 From e42ecdd7154d740800ef392c6318220944b55a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Herg=C3=A8s?= Date: Sat, 13 Sep 2025 21:31:16 +0200 Subject: build(gokord): use latest version --- user/level.go | 57 +++++++++++++++++++++------------------------------------ user/xp.go | 23 +++++++---------------- 2 files changed, 28 insertions(+), 52 deletions(-) (limited to 'user') diff --git a/user/level.go b/user/level.go index 6f92ce7..e11ac03 100644 --- a/user/level.go +++ b/user/level.go @@ -8,59 +8,44 @@ 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/user" ) -func onNewLevel(dg *discordgo.Session, m *user.Member, level uint) { +func onNewLevel(s *discordgo.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.GuildAPI().MemberRoleAdd(m.GuildID, m.User.ID, role.RoleID) + s.LogDebug("add role %s to %s in %s", role.RoleID, m.DisplayName(), 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.LogError(err, "adding role %s to %s in %s", role.RoleID, m.DisplayName(), 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.GuildAPI().MemberRoleRemove(m.GuildID, m.User.ID, role.RoleID) + s.LogDebug("remove role %s to %s in %s", role.RoleID, m.DisplayName(), 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.LogError(err, "removing role s to %s in %s", role.RoleID, m.DisplayName(), m.GuildID) } } } } -func (c *Copaing) OnNewLevel(dg *discordgo.Session, level uint) { - m, err := dg.GuildAPI().Member(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.LogError(err, "getting member %s in %s for new level", c.DiscordID, 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.LogError(err, "fetching all copaings") return } cxps := make([]*cXP, len(cs)) @@ -73,7 +58,7 @@ func PeriodicReducer(dg *discordgo.Session) { defer wg.Done() xp, err := c.GetXP() if err != nil { - logger.Alert("user/level.go - Getting XP", err.Error(), "copaing_id", c.ID, "guild_id", c.GuildID) + s.LogError(err, "getting xp of copaing %d in %s", c.ID, c.GuildID) xp = 0 } cxps[i] = &cXP{ @@ -83,7 +68,7 @@ func PeriodicReducer(dg *discordgo.Session) { }() } wg.Wait() - for _, g := range dg.State.Guilds { + for _, g := range s.State.Guilds { wg.Add(1) go func() { defer wg.Done() @@ -93,26 +78,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.LogError(res.Error, "removing old xp in %s", g.ID) } - logger.Debug("Guild cleaned", "guild", g.Name, "rows affected", res.RowsAffected) + s.LogDebug("Guild cleaned %s, rows affected: %d", g.Name, res.RowsAffected) }() } wg.Wait() for i, c := range cxps { if i%50 == 49 { - logger.Debug("Sleeping...") + s.LogDebug("Sleeping...") time.Sleep(15 * time.Second) // prevents spamming the API } oldXp := c.GetXP() xp, err := c.ToCopaing().GetXP() if err != nil { - logger.Alert("user/level.go - Getting XP", err.Error(), "guild_id", c.ID, "discord_id", c.DiscordID) + s.LogError(err, "getting xp of copaing %s in %s", c.ID, 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.LogDebug("Periodic reduce finished for %d guilds", len(s.State.Guilds)) } diff --git a/user/xp.go b/user/xp.go index 550f3bf..d130cae 100644 --- a/user/xp.go +++ b/user/xp.go @@ -7,8 +7,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/logger" "github.com/nyttikord/gokord/user" ) @@ -28,23 +28,14 @@ func (c *cXP) GetXP() uint { func (c *Copaing) AddXP(s *discordgo.Session, m *user.Member, xp uint, fn func(uint, uint)) { old, err := c.GetXP() if err != nil { - logger.Alert("user/xp.go - Getting xp", err.Error(), "discord_id", c.DiscordID, "guild_id", c.GuildID) + s.LogError(err, "getting xp for %s in %s", m.DisplayName(), 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.LogDebug("Adding xp to %s, old: %d, to add: %d", m.DisplayName(), old, xp) c.CopaingXPs = append(c.CopaingXPs, CopaingXP{CopaingID: c.ID, XP: xp, GuildID: c.GuildID}) if err = c.Save(); err != nil { - logger.Alert( - "user/xp.go - Saving user", - err.Error(), - "xp", - c.CopaingXPs, - "discord_id", - c.DiscordID, - "guild_id", - c.GuildID, - ) + s.LogError(err, "saving user %s with xp %d in %s", m.DisplayName(), xp, c.GuildID) return } newLevel := exp.Level(old + xp) @@ -78,7 +69,7 @@ func (c *Copaing) GetXPForDays(n uint) (uint, error) { 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.Log(logger.LevelError, 0, "scanning rows of copaing %d in %s: %#v", c.ID, c.GuildID, err.Error()) continue } xp += cxp.XP @@ -105,7 +96,7 @@ func GetBestXP(guildId string, n uint, d int) ([]CopaingAccess, error) { 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.Log(logger.LevelError, 0, "scanning rows of copaing %d in %s: %#v", c.ID, c.GuildID, err.Error()) continue } wg.Add(1) @@ -113,7 +104,7 @@ func GetBestXP(guildId string, n uint, d int) ([]CopaingAccess, error) { defer wg.Done() xp, err := c.GetXPForDays(uint(d)) if err != nil { - logger.Alert("user/xp.go - Fetching xp", err.Error(), "discord_id", c.DiscordID, "guild_id", guildId) + logger.Log(logger.LevelError, 0, "fetching xp of copaing %d in %s: %#v", c.ID, c.GuildID, err.Error()) return } l = append(l, &cXP{Cxp: xp, Copaing: &c}) -- cgit v1.2.3 From e8b91140fba414c2bd7e7f36e8cff95d7651732d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Herg=C3=A8s?= Date: Sat, 20 Sep 2025 13:40:41 +0200 Subject: fix(db): closing rows even if rows is nil --- user/xp.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'user') diff --git a/user/xp.go b/user/xp.go index d130cae..96a8a27 100644 --- a/user/xp.go +++ b/user/xp.go @@ -61,10 +61,10 @@ 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) @@ -86,10 +86,10 @@ func GetBestXP(guildId string, n uint, d int) ([]CopaingAccess, error) { 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() { -- cgit v1.2.3 From b61a834b608df3d5e617912eefb28924ef3a46df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Herg=C3=A8s?= Date: Fri, 26 Sep 2025 18:30:57 +0200 Subject: build(gokord): bump to latest nightly --- user/level.go | 9 ++++++--- user/xp.go | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'user') diff --git a/user/level.go b/user/level.go index e11ac03..88971e6 100644 --- a/user/level.go +++ b/user/level.go @@ -9,10 +9,11 @@ import ( "git.anhgelus.world/anhgelus/les-copaings-bot/exp" "github.com/anhgelus/gokord" discordgo "github.com/nyttikord/gokord" + "github.com/nyttikord/gokord/bot" "github.com/nyttikord/gokord/user" ) -func onNewLevel(s *discordgo.Session, m *user.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 { @@ -68,7 +69,9 @@ func PeriodicReducer(s *discordgo.Session) { }() } wg.Wait() - for _, g := range s.State.Guilds { + i := 0 + for g := range s.GuildAPI().State.Guilds() { + i++ wg.Add(1) go func() { defer wg.Done() @@ -99,5 +102,5 @@ func PeriodicReducer(s *discordgo.Session) { c.OnNewLevel(s, exp.Level(xp)) } } - s.LogDebug("Periodic reduce finished for %d guilds", len(s.State.Guilds)) + s.LogDebug("Periodic reduce finished for %d guilds", i) } diff --git a/user/xp.go b/user/xp.go index 96a8a27..16ba0ad 100644 --- a/user/xp.go +++ b/user/xp.go @@ -7,7 +7,7 @@ import ( "git.anhgelus.world/anhgelus/les-copaings-bot/config" "git.anhgelus.world/anhgelus/les-copaings-bot/exp" "github.com/anhgelus/gokord" - discordgo "github.com/nyttikord/gokord" + "github.com/nyttikord/gokord/bot" "github.com/nyttikord/gokord/logger" "github.com/nyttikord/gokord/user" ) @@ -25,7 +25,7 @@ func (c *cXP) GetXP() uint { return c.Cxp } -func (c *Copaing) AddXP(s *discordgo.Session, m *user.Member, xp uint, fn func(uint, uint)) { +func (c *Copaing) AddXP(s bot.Session, m *user.Member, xp uint, fn func(uint, uint)) { old, err := c.GetXP() if err != nil { s.LogError(err, "getting xp for %s in %s", m.DisplayName(), c.GuildID) -- cgit v1.2.3 From cfdba5f417bb31aac564d13becc09874f17d075d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Herg=C3=A8s?= Date: Sat, 27 Sep 2025 17:34:38 +0200 Subject: build(gokord): bump to latest nightly --- user/level.go | 40 ++++++++++++++++++++++++++-------------- user/xp.go | 26 +++++++++++++------------- 2 files changed, 39 insertions(+), 27 deletions(-) (limited to 'user') 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}) -- cgit v1.2.3