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/xp.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'user/xp.go') 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/xp.go | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) (limited to 'user/xp.go') 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/xp.go') 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/xp.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'user/xp.go') 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/xp.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'user/xp.go') 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