aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--events.go14
-rw-r--r--user/level.go2
-rw-r--r--user/member.go5
3 files changed, 14 insertions, 7 deletions
diff --git a/events.go b/events.go
index 6f15fd8..abf9d03 100644
--- a/events.go
+++ b/events.go
@@ -8,6 +8,7 @@ import (
"git.anhgelus.world/anhgelus/les-copaings-bot/config"
"git.anhgelus.world/anhgelus/les-copaings-bot/exp"
"git.anhgelus.world/anhgelus/les-copaings-bot/user"
+ "github.com/anhgelus/gokord"
"github.com/anhgelus/gokord/logger"
discordgo "github.com/nyttikord/gokord"
)
@@ -122,7 +123,18 @@ func OnLeave(_ *discordgo.Session, e *discordgo.GuildMemberRemove) {
return
}
c := user.GetCopaing(e.User.ID, e.GuildID)
- if err := c.Delete(); err != nil {
+ err := gokord.DB.
+ Where("copaing_id = ? and guild_id = ?", c.ID, e.GuildID).
+ Delete(&user.CopaingXP{}).
+ Error
+ if err != nil {
+ logger.Alert(
+ "events.go - deleting user xp from db", err.Error(),
+ "user_id", e.User.ID,
+ "guild_id", e.GuildID,
+ )
+ }
+ if err = c.Delete(); err != nil {
logger.Alert(
"events.go - deleting user from db", err.Error(),
"user_id", e.User.ID,
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 {