aboutsummaryrefslogtreecommitdiff
path: root/user
diff options
context:
space:
mode:
Diffstat (limited to 'user')
-rw-r--r--user/level.go57
-rw-r--r--user/xp.go23
2 files changed, 28 insertions, 52 deletions
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})
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-03 13:48:17 +0000