From c408afc8797b0da5e1d73d190a8f5884870b510c Mon Sep 17 00:00:00 2001
From: Anhgelus Morhtuuzh <anhgelus@anhgelus.world>
Date: Tue, 13 May 2025 12:50:20 +0200
Subject: style(files): reorganize everything

---
 user/xp.go | 185 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 185 insertions(+)
 create mode 100644 user/xp.go

(limited to 'user/xp.go')

diff --git a/user/xp.go b/user/xp.go
new file mode 100644
index 0000000..6cd9b75
--- /dev/null
+++ b/user/xp.go
@@ -0,0 +1,185 @@
+package user
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"github.com/anhgelus/gokord"
+	"github.com/anhgelus/gokord/utils"
+	"github.com/anhgelus/les-copaings-bot/config"
+	"github.com/anhgelus/les-copaings-bot/exp"
+	"github.com/bwmarrin/discordgo"
+	"github.com/redis/go-redis/v9"
+	"gorm.io/gorm"
+	"math"
+	"strconv"
+	"time"
+)
+
+func (c *Copaing) AddXP(s *discordgo.Session, m *discordgo.Member, xp uint, fn func(uint, uint)) {
+	pastLevel := exp.Level(c.XP)
+	old := c.XP
+	c.XP += xp
+	if err := c.Save(); err != nil {
+		utils.SendAlert(
+			"exp/level.go - Saving user",
+			err.Error(),
+			"exp",
+			c.XP,
+			"discord_id",
+			c.DiscordID,
+			"guild_id",
+			c.GuildID,
+		)
+		c.XP = old
+		return
+	}
+	newLevel := exp.Level(c.XP)
+	if newLevel > pastLevel {
+		fn(c.XP, newLevel)
+		onNewLevel(s, m, newLevel)
+	}
+}
+
+func (c *Copaing) SetLastEvent() {
+	client, err := config.GetRedisClient()
+	if err != nil {
+		utils.SendAlert("exp/member.go - Getting redis client (set)", err.Error())
+		return
+	}
+	t := time.Now().Unix()
+	err = client.Set(context.Background(), c.GenKey(LastEvent), strconv.FormatInt(t, 10), 0).Err()
+	if err != nil {
+		utils.SendAlert("exp/member.go - Setting last event", err.Error(), "time", t, "base_key", c.GenKey(""))
+		return
+	}
+	err = client.Set(context.Background(), c.GenKey(AlreadyRemoved), "0", 0).Err()
+	if err != nil {
+		utils.SendAlert(
+			"exp/member.go - Setting already removed to 0",
+			err.Error(),
+			"time",
+			t,
+			"base_key",
+			c.GenKey(""),
+		)
+		return
+	}
+}
+
+func (c *Copaing) HourSinceLastEvent() uint {
+	client, err := config.GetRedisClient()
+	if err != nil {
+		utils.SendAlert("exp/member.go - Getting redis client (get)", err.Error())
+		return 0
+	}
+	res := client.Get(context.Background(), c.GenKey(LastEvent))
+	if errors.Is(res.Err(), redis.Nil) {
+		return 0
+	} else if res.Err() != nil {
+		utils.SendAlert("exp/member.go - Getting last event", res.Err().Error(), "base_key", c.GenKey(""))
+		return 0
+	}
+	t := time.Now().Unix()
+	last, err := strconv.Atoi(res.Val())
+	if err != nil {
+		utils.SendAlert(
+			"exp/member.go - Converting time fetched into int (last event)",
+			err.Error(),
+			"base_key",
+			c.GenKey(""),
+			"val",
+			res.Val(),
+		)
+		return 0
+	}
+	if gokord.Debug {
+		return uint(math.Floor(float64(t-int64(last)) / 60)) // not hours of unix, is minutes of unix
+	}
+	return utils.HoursOfUnix(t - int64(last))
+}
+
+func (c *Copaing) AddXPAlreadyRemoved(xp uint) uint {
+	client, err := config.GetRedisClient()
+	if err != nil {
+		utils.SendAlert("exp/member.go - Getting redis client (set)", err.Error())
+		return 0
+	}
+	exp := xp + c.XPAlreadyRemoved()
+	err = client.Set(context.Background(), c.GenKey(AlreadyRemoved), exp, 0).Err()
+	if err != nil {
+		utils.SendAlert(
+			"exp/member.go - Setting already removed",
+			err.Error(),
+			"exp already removed",
+			exp,
+			"base_key",
+			c.GenKey(""),
+		)
+		return 0
+	}
+	return exp
+}
+
+func (c *Copaing) XPAlreadyRemoved() uint {
+	client, err := config.GetRedisClient()
+	if err != nil {
+		utils.SendAlert("exp/member.go - Getting redis client (exp)", err.Error())
+		return 0
+	}
+	res := client.Get(context.Background(), fmt.Sprintf("%s:%s", c.GenKey(""), AlreadyRemoved))
+	if errors.Is(res.Err(), redis.Nil) {
+		return 0
+	} else if res.Err() != nil {
+		utils.SendAlert("exp/member.go - Getting already removed", res.Err().Error(), "base_key", c.GenKey(""))
+		return 0
+	}
+	xp, err := strconv.Atoi(res.Val())
+	if err != nil {
+		utils.SendAlert(
+			"exp/member.go - Converting time fetched into int (already removed)",
+			err.Error(),
+			"base_key",
+			c.GenKey(""),
+			"val",
+			res.Val(),
+		)
+		return 0
+	}
+	if xp < 0 {
+		utils.SendAlert(
+			"exp/member.go - Assertion exp >= 0",
+			"exp is negative",
+			"base_key",
+			c.GenKey(""),
+			"exp",
+			xp,
+		)
+		return 0
+	}
+	return uint(xp)
+}
+
+func (c *Copaing) Reset() {
+	gokord.DB.Where("guild_id = ? AND discord_id = ?", c.GuildID, c.DiscordID).Delete(c)
+}
+
+func (c *Copaing) AfterDelete(db *gorm.DB) error {
+	id := c.ID
+	dID := c.DiscordID
+	gID := c.GuildID
+	k := c.GuildID + ":" + c.DiscordID
+	ch := utils.NewTimer(48*time.Hour, func(stop chan<- interface{}) {
+		if err := db.Unscoped().Where("id = ?", id).Delete(c).Error; err != nil {
+			utils.SendAlert(
+				"exp/member.go - Removing user from database", err.Error(),
+				"discord_id", dID,
+				"guild_id", gID,
+			)
+		}
+		stop <- true
+		leftCopaingsMap[k] = nil
+	})
+	leftCopaingsMap[k] = &leftCopaing{id, ch}
+	return nil
+}
-- 
cgit v1.2.3


From d38c57b83009bf0a8b22bede7ee786d6f54fc66a Mon Sep 17 00:00:00 2001
From: Anhgelus Morhtuuzh <anhgelus@anhgelus.world>
Date: Tue, 13 May 2025 13:00:09 +0200
Subject: fix(log): wrong pos in many alerts

---
 user/xp.go | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'user/xp.go')

diff --git a/user/xp.go b/user/xp.go
index 6cd9b75..4b93f26 100644
--- a/user/xp.go
+++ b/user/xp.go
@@ -22,7 +22,7 @@ func (c *Copaing) AddXP(s *discordgo.Session, m *discordgo.Member, xp uint, fn f
 	c.XP += xp
 	if err := c.Save(); err != nil {
 		utils.SendAlert(
-			"exp/level.go - Saving user",
+			"user/xp.go - Saving user",
 			err.Error(),
 			"exp",
 			c.XP,
@@ -44,19 +44,19 @@ func (c *Copaing) AddXP(s *discordgo.Session, m *discordgo.Member, xp uint, fn f
 func (c *Copaing) SetLastEvent() {
 	client, err := config.GetRedisClient()
 	if err != nil {
-		utils.SendAlert("exp/member.go - Getting redis client (set)", err.Error())
+		utils.SendAlert("user/xp.go - Getting redis client (set)", err.Error())
 		return
 	}
 	t := time.Now().Unix()
 	err = client.Set(context.Background(), c.GenKey(LastEvent), strconv.FormatInt(t, 10), 0).Err()
 	if err != nil {
-		utils.SendAlert("exp/member.go - Setting last event", err.Error(), "time", t, "base_key", c.GenKey(""))
+		utils.SendAlert("user/xp.go - Setting last event", err.Error(), "time", t, "base_key", c.GenKey(""))
 		return
 	}
 	err = client.Set(context.Background(), c.GenKey(AlreadyRemoved), "0", 0).Err()
 	if err != nil {
 		utils.SendAlert(
-			"exp/member.go - Setting already removed to 0",
+			"user/xp.go - Setting already removed to 0",
 			err.Error(),
 			"time",
 			t,
@@ -70,21 +70,21 @@ func (c *Copaing) SetLastEvent() {
 func (c *Copaing) HourSinceLastEvent() uint {
 	client, err := config.GetRedisClient()
 	if err != nil {
-		utils.SendAlert("exp/member.go - Getting redis client (get)", err.Error())
+		utils.SendAlert("user/xp.go - Getting redis client (get)", err.Error())
 		return 0
 	}
 	res := client.Get(context.Background(), c.GenKey(LastEvent))
 	if errors.Is(res.Err(), redis.Nil) {
 		return 0
 	} else if res.Err() != nil {
-		utils.SendAlert("exp/member.go - Getting last event", res.Err().Error(), "base_key", c.GenKey(""))
+		utils.SendAlert("user/xp.go - Getting last event", res.Err().Error(), "base_key", c.GenKey(""))
 		return 0
 	}
 	t := time.Now().Unix()
 	last, err := strconv.Atoi(res.Val())
 	if err != nil {
 		utils.SendAlert(
-			"exp/member.go - Converting time fetched into int (last event)",
+			"user/xp.go - Converting time fetched into int (last event)",
 			err.Error(),
 			"base_key",
 			c.GenKey(""),
@@ -102,14 +102,14 @@ func (c *Copaing) HourSinceLastEvent() uint {
 func (c *Copaing) AddXPAlreadyRemoved(xp uint) uint {
 	client, err := config.GetRedisClient()
 	if err != nil {
-		utils.SendAlert("exp/member.go - Getting redis client (set)", err.Error())
+		utils.SendAlert("user/xp.go - Getting redis client (set)", err.Error())
 		return 0
 	}
 	exp := xp + c.XPAlreadyRemoved()
 	err = client.Set(context.Background(), c.GenKey(AlreadyRemoved), exp, 0).Err()
 	if err != nil {
 		utils.SendAlert(
-			"exp/member.go - Setting already removed",
+			"user/xp.go - Setting already removed",
 			err.Error(),
 			"exp already removed",
 			exp,
@@ -124,20 +124,20 @@ func (c *Copaing) AddXPAlreadyRemoved(xp uint) uint {
 func (c *Copaing) XPAlreadyRemoved() uint {
 	client, err := config.GetRedisClient()
 	if err != nil {
-		utils.SendAlert("exp/member.go - Getting redis client (exp)", err.Error())
+		utils.SendAlert("user/xp.go - Getting redis client (exp)", err.Error())
 		return 0
 	}
 	res := client.Get(context.Background(), fmt.Sprintf("%s:%s", c.GenKey(""), AlreadyRemoved))
 	if errors.Is(res.Err(), redis.Nil) {
 		return 0
 	} else if res.Err() != nil {
-		utils.SendAlert("exp/member.go - Getting already removed", res.Err().Error(), "base_key", c.GenKey(""))
+		utils.SendAlert("user/xp.go - Getting already removed", res.Err().Error(), "base_key", c.GenKey(""))
 		return 0
 	}
 	xp, err := strconv.Atoi(res.Val())
 	if err != nil {
 		utils.SendAlert(
-			"exp/member.go - Converting time fetched into int (already removed)",
+			"user/xp.go - Converting time fetched into int (already removed)",
 			err.Error(),
 			"base_key",
 			c.GenKey(""),
@@ -148,11 +148,11 @@ func (c *Copaing) XPAlreadyRemoved() uint {
 	}
 	if xp < 0 {
 		utils.SendAlert(
-			"exp/member.go - Assertion exp >= 0",
-			"exp is negative",
+			"user/xp.go - Assertion exp >= 0",
+			"xp is negative",
 			"base_key",
 			c.GenKey(""),
-			"exp",
+			"xp",
 			xp,
 		)
 		return 0
@@ -172,7 +172,7 @@ func (c *Copaing) AfterDelete(db *gorm.DB) error {
 	ch := utils.NewTimer(48*time.Hour, func(stop chan<- interface{}) {
 		if err := db.Unscoped().Where("id = ?", id).Delete(c).Error; err != nil {
 			utils.SendAlert(
-				"exp/member.go - Removing user from database", err.Error(),
+				"user/xp.go - Removing user from database", err.Error(),
 				"discord_id", dID,
 				"guild_id", gID,
 			)
-- 
cgit v1.2.3


From 6b6c775ab3af659e26f0c79dbabd86d88d2451d5 Mon Sep 17 00:00:00 2001
From: Anhgelus Morhtuuzh <anhgelus@anhgelus.world>
Date: Tue, 13 May 2025 13:15:59 +0200
Subject: refactor(gorm): remove ...At fields from model

---
 user/xp.go | 33 ++++-----------------------------
 1 file changed, 4 insertions(+), 29 deletions(-)

(limited to 'user/xp.go')

diff --git a/user/xp.go b/user/xp.go
index 4b93f26..90be09d 100644
--- a/user/xp.go
+++ b/user/xp.go
@@ -10,7 +10,6 @@ import (
 	"github.com/anhgelus/les-copaings-bot/exp"
 	"github.com/bwmarrin/discordgo"
 	"github.com/redis/go-redis/v9"
-	"gorm.io/gorm"
 	"math"
 	"strconv"
 	"time"
@@ -105,20 +104,20 @@ func (c *Copaing) AddXPAlreadyRemoved(xp uint) uint {
 		utils.SendAlert("user/xp.go - Getting redis client (set)", err.Error())
 		return 0
 	}
-	exp := xp + c.XPAlreadyRemoved()
-	err = client.Set(context.Background(), c.GenKey(AlreadyRemoved), exp, 0).Err()
+	nxp := xp + c.XPAlreadyRemoved()
+	err = client.Set(context.Background(), c.GenKey(AlreadyRemoved), nxp, 0).Err()
 	if err != nil {
 		utils.SendAlert(
 			"user/xp.go - Setting already removed",
 			err.Error(),
 			"exp already removed",
-			exp,
+			nxp,
 			"base_key",
 			c.GenKey(""),
 		)
 		return 0
 	}
-	return exp
+	return nxp
 }
 
 func (c *Copaing) XPAlreadyRemoved() uint {
@@ -159,27 +158,3 @@ func (c *Copaing) XPAlreadyRemoved() uint {
 	}
 	return uint(xp)
 }
-
-func (c *Copaing) Reset() {
-	gokord.DB.Where("guild_id = ? AND discord_id = ?", c.GuildID, c.DiscordID).Delete(c)
-}
-
-func (c *Copaing) AfterDelete(db *gorm.DB) error {
-	id := c.ID
-	dID := c.DiscordID
-	gID := c.GuildID
-	k := c.GuildID + ":" + c.DiscordID
-	ch := utils.NewTimer(48*time.Hour, func(stop chan<- interface{}) {
-		if err := db.Unscoped().Where("id = ?", id).Delete(c).Error; err != nil {
-			utils.SendAlert(
-				"user/xp.go - Removing user from database", err.Error(),
-				"discord_id", dID,
-				"guild_id", gID,
-			)
-		}
-		stop <- true
-		leftCopaingsMap[k] = nil
-	})
-	leftCopaingsMap[k] = &leftCopaing{id, ch}
-	return nil
-}
-- 
cgit v1.2.3


From e0a8f6634424f10a22b0a0740e0bbc17534eaa0e Mon Sep 17 00:00:00 2001
From: Anhgelus Morhtuuzh <anhgelus@anhgelus.world>
Date: Tue, 13 May 2025 13:26:32 +0200
Subject: refactor(xp): remove reducer

---
 user/xp.go | 128 -------------------------------------------------------------
 1 file changed, 128 deletions(-)

(limited to 'user/xp.go')

diff --git a/user/xp.go b/user/xp.go
index 90be09d..23cefcd 100644
--- a/user/xp.go
+++ b/user/xp.go
@@ -1,18 +1,9 @@
 package user
 
 import (
-	"context"
-	"errors"
-	"fmt"
-	"github.com/anhgelus/gokord"
 	"github.com/anhgelus/gokord/utils"
-	"github.com/anhgelus/les-copaings-bot/config"
 	"github.com/anhgelus/les-copaings-bot/exp"
 	"github.com/bwmarrin/discordgo"
-	"github.com/redis/go-redis/v9"
-	"math"
-	"strconv"
-	"time"
 )
 
 func (c *Copaing) AddXP(s *discordgo.Session, m *discordgo.Member, xp uint, fn func(uint, uint)) {
@@ -39,122 +30,3 @@ func (c *Copaing) AddXP(s *discordgo.Session, m *discordgo.Member, xp uint, fn f
 		onNewLevel(s, m, newLevel)
 	}
 }
-
-func (c *Copaing) SetLastEvent() {
-	client, err := config.GetRedisClient()
-	if err != nil {
-		utils.SendAlert("user/xp.go - Getting redis client (set)", err.Error())
-		return
-	}
-	t := time.Now().Unix()
-	err = client.Set(context.Background(), c.GenKey(LastEvent), strconv.FormatInt(t, 10), 0).Err()
-	if err != nil {
-		utils.SendAlert("user/xp.go - Setting last event", err.Error(), "time", t, "base_key", c.GenKey(""))
-		return
-	}
-	err = client.Set(context.Background(), c.GenKey(AlreadyRemoved), "0", 0).Err()
-	if err != nil {
-		utils.SendAlert(
-			"user/xp.go - Setting already removed to 0",
-			err.Error(),
-			"time",
-			t,
-			"base_key",
-			c.GenKey(""),
-		)
-		return
-	}
-}
-
-func (c *Copaing) HourSinceLastEvent() uint {
-	client, err := config.GetRedisClient()
-	if err != nil {
-		utils.SendAlert("user/xp.go - Getting redis client (get)", err.Error())
-		return 0
-	}
-	res := client.Get(context.Background(), c.GenKey(LastEvent))
-	if errors.Is(res.Err(), redis.Nil) {
-		return 0
-	} else if res.Err() != nil {
-		utils.SendAlert("user/xp.go - Getting last event", res.Err().Error(), "base_key", c.GenKey(""))
-		return 0
-	}
-	t := time.Now().Unix()
-	last, err := strconv.Atoi(res.Val())
-	if err != nil {
-		utils.SendAlert(
-			"user/xp.go - Converting time fetched into int (last event)",
-			err.Error(),
-			"base_key",
-			c.GenKey(""),
-			"val",
-			res.Val(),
-		)
-		return 0
-	}
-	if gokord.Debug {
-		return uint(math.Floor(float64(t-int64(last)) / 60)) // not hours of unix, is minutes of unix
-	}
-	return utils.HoursOfUnix(t - int64(last))
-}
-
-func (c *Copaing) AddXPAlreadyRemoved(xp uint) uint {
-	client, err := config.GetRedisClient()
-	if err != nil {
-		utils.SendAlert("user/xp.go - Getting redis client (set)", err.Error())
-		return 0
-	}
-	nxp := xp + c.XPAlreadyRemoved()
-	err = client.Set(context.Background(), c.GenKey(AlreadyRemoved), nxp, 0).Err()
-	if err != nil {
-		utils.SendAlert(
-			"user/xp.go - Setting already removed",
-			err.Error(),
-			"exp already removed",
-			nxp,
-			"base_key",
-			c.GenKey(""),
-		)
-		return 0
-	}
-	return nxp
-}
-
-func (c *Copaing) XPAlreadyRemoved() uint {
-	client, err := config.GetRedisClient()
-	if err != nil {
-		utils.SendAlert("user/xp.go - Getting redis client (exp)", err.Error())
-		return 0
-	}
-	res := client.Get(context.Background(), fmt.Sprintf("%s:%s", c.GenKey(""), AlreadyRemoved))
-	if errors.Is(res.Err(), redis.Nil) {
-		return 0
-	} else if res.Err() != nil {
-		utils.SendAlert("user/xp.go - Getting already removed", res.Err().Error(), "base_key", c.GenKey(""))
-		return 0
-	}
-	xp, err := strconv.Atoi(res.Val())
-	if err != nil {
-		utils.SendAlert(
-			"user/xp.go - Converting time fetched into int (already removed)",
-			err.Error(),
-			"base_key",
-			c.GenKey(""),
-			"val",
-			res.Val(),
-		)
-		return 0
-	}
-	if xp < 0 {
-		utils.SendAlert(
-			"user/xp.go - Assertion exp >= 0",
-			"xp is negative",
-			"base_key",
-			c.GenKey(""),
-			"xp",
-			xp,
-		)
-		return 0
-	}
-	return uint(xp)
-}
-- 
cgit v1.2.3


From 799df74fcda5266fd295b49fc759c605c815cad9 Mon Sep 17 00:00:00 2001
From: Anhgelus Morhtuuzh <anhgelus@anhgelus.world>
Date: Tue, 13 May 2025 14:11:11 +0200
Subject: feat(xp): new add

---
 user/xp.go | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'user/xp.go')

diff --git a/user/xp.go b/user/xp.go
index 23cefcd..f8bcd06 100644
--- a/user/xp.go
+++ b/user/xp.go
@@ -7,10 +7,10 @@ import (
 )
 
 func (c *Copaing) AddXP(s *discordgo.Session, m *discordgo.Member, xp uint, fn func(uint, uint)) {
-	pastLevel := exp.Level(c.XP)
-	old := c.XP
-	c.XP += xp
-	if err := c.Save(); err != nil {
+	old, err := c.GetXP()
+	pastLevel := exp.Level(old)
+	c.XP = append(c.XP, CopaingXP{CopaingID: c.ID, XP: xp, GuildID: c.GuildID})
+	if err = c.Save(); err != nil {
 		utils.SendAlert(
 			"user/xp.go - Saving user",
 			err.Error(),
@@ -21,12 +21,11 @@ func (c *Copaing) AddXP(s *discordgo.Session, m *discordgo.Member, xp uint, fn f
 			"guild_id",
 			c.GuildID,
 		)
-		c.XP = old
 		return
 	}
-	newLevel := exp.Level(c.XP)
+	newLevel := exp.Level(old + xp)
 	if newLevel > pastLevel {
-		fn(c.XP, newLevel)
+		fn(old+xp, newLevel)
 		onNewLevel(s, m, newLevel)
 	}
 }
-- 
cgit v1.2.3


From 01bafe9bf1de5be4e770b9500480807d4973d8d6 Mon Sep 17 00:00:00 2001
From: Anhgelus Morhtuuzh <anhgelus@anhgelus.world>
Date: Tue, 13 May 2025 16:15:47 +0200
Subject: feat(top): implements new kind of tops

---
 user/xp.go | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)

(limited to 'user/xp.go')

diff --git a/user/xp.go b/user/xp.go
index f8bcd06..c2e4d08 100644
--- a/user/xp.go
+++ b/user/xp.go
@@ -1,11 +1,30 @@
 package user
 
 import (
+	"fmt"
+	"github.com/anhgelus/gokord"
 	"github.com/anhgelus/gokord/utils"
+	"github.com/anhgelus/les-copaings-bot/config"
 	"github.com/anhgelus/les-copaings-bot/exp"
 	"github.com/bwmarrin/discordgo"
+	"slices"
+	"sync"
+	"time"
 )
 
+type cXP struct {
+	Cxp uint
+	*Copaing
+}
+
+func (c *cXP) ToCopaing() *Copaing {
+	return c.Copaing
+}
+
+func (c *cXP) GetXP() uint {
+	return c.Cxp
+}
+
 func (c *Copaing) AddXP(s *discordgo.Session, m *discordgo.Member, xp uint, fn func(uint, uint)) {
 	old, err := c.GetXP()
 	pastLevel := exp.Level(old)
@@ -29,3 +48,83 @@ func (c *Copaing) AddXP(s *discordgo.Session, m *discordgo.Member, xp uint, fn f
 		onNewLevel(s, m, newLevel)
 	}
 }
+
+func (c *Copaing) GetXP() (uint, error) {
+	cfg := config.GetGuildConfig(c.GuildID)
+	return c.GetXPForDays(cfg.DaysXPRemains)
+}
+
+func (c *Copaing) GetXPForDays(n uint) (uint, error) {
+	xp := uint(0)
+	y, m, d := time.Unix(time.Now().Unix()-int64(n*24*60*60), 0).Date()
+	rows, err := gokord.DB.
+		Model(&CopaingXP{}).
+		Where(fmt.Sprintf("created_at >= '%d-%d-%d' and guild_id = ? and discord_id = ?", y, m, d), c.GuildID, c.DiscordID).
+		Rows()
+	defer rows.Close()
+	if err != nil {
+		return 0, err
+	}
+	for rows.Next() {
+		var cXP CopaingXP
+		err = gokord.DB.ScanRows(rows, &cXP)
+		if err != nil {
+			utils.SendAlert("user/xp.go - Scanning rows", err.Error(), "discord_id", c.DiscordID, "guild_id", c.GuildID)
+			continue
+		}
+		xp += cXP.XP
+	}
+	return xp, nil
+}
+
+// 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) {
+	if d < 0 {
+		cfg := config.GetGuildConfig(guildId)
+		d = int(cfg.DaysXPRemains)
+	}
+	rows, err := gokord.DB.Model(&Copaing{}).Where("guild_id = ?", guildId).Rows()
+	defer rows.Close()
+	if err != nil {
+		return nil, err
+	}
+	var l []*cXP
+	wg := sync.WaitGroup{}
+	for rows.Next() {
+		var c Copaing
+		err = gokord.DB.ScanRows(rows, &c)
+		if err != nil {
+			utils.SendAlert("user/xp.go - Scanning rows", err.Error(), "discord_id", c.DiscordID, "guild_id", guildId)
+			continue
+		}
+		wg.Add(1)
+		go func() {
+			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)
+				return
+			}
+			l = append(l, &cXP{Cxp: xp, Copaing: &c})
+		}()
+	}
+	wg.Wait()
+	slices.SortFunc(l, func(a, b *cXP) int {
+		// desc order
+		if a.Cxp < b.Cxp {
+			return 1
+		}
+		if a.Cxp > b.Cxp {
+			return -1
+		}
+		return 0
+	})
+	m := min(len(l), int(n))
+	cs := make([]CopaingAccess, m)
+	for i, c := range l[:m] {
+		cs[i] = c
+	}
+	return cs, nil
+}
-- 
cgit v1.2.3


From 61c7bf4567249da0d13c2f738e56754a2c181c99 Mon Sep 17 00:00:00 2001
From: Anhgelus Morhtuuzh <anhgelus@anhgelus.world>
Date: Tue, 13 May 2025 16:52:04 +0200
Subject: fix(db): wrong relation and bad where condition

---
 user/xp.go | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'user/xp.go')

diff --git a/user/xp.go b/user/xp.go
index c2e4d08..fca5754 100644
--- a/user/xp.go
+++ b/user/xp.go
@@ -28,13 +28,13 @@ 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()
 	pastLevel := exp.Level(old)
-	c.XP = append(c.XP, CopaingXP{CopaingID: c.ID, XP: xp, GuildID: c.GuildID})
+	c.CopaingXPs = append(c.CopaingXPs, CopaingXP{CopaingID: c.ID, XP: xp, GuildID: c.GuildID})
 	if err = c.Save(); err != nil {
 		utils.SendAlert(
 			"user/xp.go - Saving user",
 			err.Error(),
-			"exp",
-			c.XP,
+			"xp",
+			c.CopaingXPs,
 			"discord_id",
 			c.DiscordID,
 			"guild_id",
@@ -56,10 +56,16 @@ func (c *Copaing) GetXP() (uint, error) {
 
 func (c *Copaing) GetXPForDays(n uint) (uint, error) {
 	xp := uint(0)
-	y, m, d := time.Unix(time.Now().Unix()-int64(n*24*60*60), 0).Date()
+	var y, d int
+	var m time.Month
+	if gokord.Debug {
+		y, m, d = time.Unix(time.Now().Unix()-int64(n*24), 0).Date() // reduce time for debug
+	} else {
+		y, m, d = time.Unix(time.Now().Unix()-int64(n*24*60*60), 0).Date()
+	}
 	rows, err := gokord.DB.
 		Model(&CopaingXP{}).
-		Where(fmt.Sprintf("created_at >= '%d-%d-%d' and guild_id = ? and discord_id = ?", y, m, d), c.GuildID, c.DiscordID).
+		Where(fmt.Sprintf("created_at >= '%d-%d-%d' and guild_id = ? and copaing_id = ?", y, m, d), c.GuildID, c.DiscordID).
 		Rows()
 	defer rows.Close()
 	if err != nil {
@@ -69,7 +75,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(), "discord_id", c.DiscordID, "guild_id", c.GuildID)
+			utils.SendAlert("user/xp.go - Scanning rows", err.Error(), "copaing_id", c.DiscordID, "guild_id", c.GuildID)
 			continue
 		}
 		xp += cXP.XP
@@ -96,7 +102,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(), "discord_id", c.DiscordID, "guild_id", guildId)
+			utils.SendAlert("user/xp.go - Scanning rows", err.Error(), "guild_id", guildId)
 			continue
 		}
 		wg.Add(1)
-- 
cgit v1.2.3


From 067e149e72da10790e347b82045d82a96397d6cf Mon Sep 17 00:00:00 2001
From: Anhgelus Morhtuuzh <anhgelus@anhgelus.world>
Date: Tue, 13 May 2025 17:18:33 +0200
Subject: fix(db): using discord_id instead of db's id

---
 user/xp.go | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'user/xp.go')

diff --git a/user/xp.go b/user/xp.go
index fca5754..7501139 100644
--- a/user/xp.go
+++ b/user/xp.go
@@ -27,7 +27,12 @@ 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)
+		return
+	}
 	pastLevel := exp.Level(old)
+	utils.SendDebug("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(
@@ -59,13 +64,13 @@ func (c *Copaing) GetXPForDays(n uint) (uint, error) {
 	var y, d int
 	var m time.Month
 	if gokord.Debug {
-		y, m, d = time.Unix(time.Now().Unix()-int64(n*24), 0).Date() // reduce time for debug
+		y, m, d = time.Unix(time.Now().Unix()-int64(24*60*60), 0).Date() // reduce time for debug
 	} else {
 		y, m, d = time.Unix(time.Now().Unix()-int64(n*24*60*60), 0).Date()
 	}
 	rows, err := gokord.DB.
 		Model(&CopaingXP{}).
-		Where(fmt.Sprintf("created_at >= '%d-%d-%d' and guild_id = ? and copaing_id = ?", y, m, d), c.GuildID, c.DiscordID).
+		Where(fmt.Sprintf("created_at >= '%d-%d-%d' and guild_id = ? and copaing_id = ?", y, m, d), c.GuildID, c.ID).
 		Rows()
 	defer rows.Close()
 	if err != nil {
@@ -75,7 +80,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.DiscordID, "guild_id", c.GuildID)
+			utils.SendAlert("user/xp.go - Scanning rows", err.Error(), "copaing_id", c.ID, "guild_id", c.GuildID)
 			continue
 		}
 		xp += cXP.XP
-- 
cgit v1.2.3


From eaf9fa51cdd9509c5d075633b712ec9b5ea712c7 Mon Sep 17 00:00:00 2001
From: Anhgelus Morhtuuzh <anhgelus@anhgelus.world>
Date: Tue, 13 May 2025 17:35:03 +0200
Subject: perf(db): remove useless XP data

---
 user/xp.go | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'user/xp.go')

diff --git a/user/xp.go b/user/xp.go
index 7501139..d88e3ce 100644
--- a/user/xp.go
+++ b/user/xp.go
@@ -1,7 +1,6 @@
 package user
 
 import (
-	"fmt"
 	"github.com/anhgelus/gokord"
 	"github.com/anhgelus/gokord/utils"
 	"github.com/anhgelus/les-copaings-bot/config"
@@ -9,7 +8,6 @@ import (
 	"github.com/bwmarrin/discordgo"
 	"slices"
 	"sync"
-	"time"
 )
 
 type cXP struct {
@@ -61,16 +59,14 @@ func (c *Copaing) GetXP() (uint, error) {
 
 func (c *Copaing) GetXPForDays(n uint) (uint, error) {
 	xp := uint(0)
-	var y, d int
-	var m time.Month
-	if gokord.Debug {
-		y, m, d = time.Unix(time.Now().Unix()-int64(24*60*60), 0).Date() // reduce time for debug
-	} else {
-		y, m, d = time.Unix(time.Now().Unix()-int64(n*24*60*60), 0).Date()
-	}
 	rows, err := gokord.DB.
 		Model(&CopaingXP{}).
-		Where(fmt.Sprintf("created_at >= '%d-%d-%d' and guild_id = ? and copaing_id = ?", y, m, d), c.GuildID, c.ID).
+		Where(
+			"created_at >= '?' and guild_id = ? and copaing_id = ?",
+			exp.TimeStampNDaysBefore(n),
+			c.GuildID,
+			c.ID,
+		).
 		Rows()
 	defer rows.Close()
 	if err != nil {
-- 
cgit v1.2.3


From f2fbf1db929e4bd2b3af014fb8d9af4c0f934a1e Mon Sep 17 00:00:00 2001
From: Anhgelus Morhtuuzh <anhgelus@anhgelus.world>
Date: Tue, 13 May 2025 18:06:17 +0200
Subject: feat(xp): update role after removing all old xp

---
 user/xp.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'user/xp.go')

diff --git a/user/xp.go b/user/xp.go
index d88e3ce..71a1ced 100644
--- a/user/xp.go
+++ b/user/xp.go
@@ -62,7 +62,7 @@ func (c *Copaing) GetXPForDays(n uint) (uint, error) {
 	rows, err := gokord.DB.
 		Model(&CopaingXP{}).
 		Where(
-			"created_at >= '?' and guild_id = ? and copaing_id = ?",
+			"created_at >= ? and guild_id = ? and copaing_id = ?",
 			exp.TimeStampNDaysBefore(n),
 			c.GuildID,
 			c.ID,
@@ -73,13 +73,13 @@ func (c *Copaing) GetXPForDays(n uint) (uint, error) {
 		return 0, err
 	}
 	for rows.Next() {
-		var cXP CopaingXP
-		err = gokord.DB.ScanRows(rows, &cXP)
+		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)
 			continue
 		}
-		xp += cXP.XP
+		xp += cxp.XP
 	}
 	return xp, nil
 }
-- 
cgit v1.2.3