From 7807211863622740decb0761d3ee1a73658cdcb6 Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Wed, 21 May 2025 19:07:11 +0200 Subject: [PATCH 01/10] build(gokord): bump version to 3.1.1 --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index 53b26ac..bb7512e 100644 --- a/main.go +++ b/main.go @@ -19,7 +19,7 @@ var ( Version = gokord.Version{ Major: 3, Minor: 1, - Patch: 0, + Patch: 1, } stopPeriodicReducer chan<- interface{} From 3738a8b8e88d25d700c3135eab78a0e0ee68271b Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Wed, 21 May 2025 19:13:00 +0200 Subject: [PATCH 02/10] fix(intents): not getting message content --- main.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index bb7512e..7f0c64f 100644 --- a/main.go +++ b/main.go @@ -19,7 +19,7 @@ var ( Version = gokord.Version{ Major: 3, Minor: 1, - Patch: 1, + Patch: 2, } stopPeriodicReducer chan<- interface{} @@ -171,7 +171,9 @@ func main() { AfterInit: afterInit, Innovations: innovations, Version: &Version, - Intents: discordgo.IntentsAllWithoutPrivileged | discordgo.IntentsGuildMessages | discordgo.IntentGuildMembers, + Intents: discordgo.IntentsAllWithoutPrivileged | + discordgo.IntentsMessageContent | + discordgo.IntentGuildMembers, } bot.Start() From b92911fb6ccd11910f394eef02090071d8d45114 Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Sat, 31 May 2025 02:26:53 +0200 Subject: [PATCH 03/10] build(gokord): upgrade to v0.9.0 --- commands/config.go | 100 ++++++++++++++++++++++---------------------- commands/credits.go | 43 ++++++++++--------- commands/rank.go | 8 ++-- commands/reset.go | 10 ++--- commands/top.go | 7 +++- go.mod | 8 ++-- go.sum | 8 ++++ 7 files changed, 96 insertions(+), 88 deletions(-) diff --git a/commands/config.go b/commands/config.go index a6a98d0..35d48be 100644 --- a/commands/config.go +++ b/commands/config.go @@ -44,32 +44,30 @@ func ConfigShow(s *discordgo.Session, i *discordgo.InteractionCreate) { } else { defaultChan = fmt.Sprintf("<#%s>", cfg.FallbackChannel) } - err := resp.Embeds([]*discordgo.MessageEmbed{ - { - Type: discordgo.EmbedTypeRich, - Title: "Config", - Color: utils.Success, - Fields: []*discordgo.MessageEmbedField{ - { - Name: "Salon par défaut", - Value: defaultChan, - Inline: false, - }, - { - Name: "Rôles liés aux niveaux", - Value: roles, - Inline: false, - }, - { - Name: "Salons désactivés", - Value: chans, - Inline: false, - }, - { - Name: "Jours avant la réduction", - Value: fmt.Sprintf("%d", cfg.DaysXPRemains), - Inline: false, - }, + err := resp.AddEmbed(&discordgo.MessageEmbed{ + Type: discordgo.EmbedTypeRich, + Title: "Config", + Color: utils.Success, + Fields: []*discordgo.MessageEmbedField{ + { + Name: "Salon par défaut", + Value: defaultChan, + Inline: false, + }, + { + Name: "Rôles liés aux niveaux", + Value: roles, + Inline: false, + }, + { + Name: "Salons désactivés", + Value: chans, + Inline: false, + }, + { + Name: "Jours avant la réduction", + Value: fmt.Sprintf("%d", cfg.DaysXPRemains), + Inline: false, }, }, }).Send() @@ -84,7 +82,7 @@ func ConfigXP(s *discordgo.Session, i *discordgo.InteractionCreate) { // verify every args t, ok := optMap["type"] if !ok { - err := resp.Message("Le type d'action n'a pas été renseigné.").Send() + err := resp.SetMessage("Le type d'action n'a pas été renseigné.").Send() if err != nil { utils.SendAlert("commands/config.go - Action type not set", err.Error()) } @@ -93,7 +91,7 @@ func ConfigXP(s *discordgo.Session, i *discordgo.InteractionCreate) { ts := t.StringValue() lvl, ok := optMap["level"] if !ok { - err := resp.Message("Le niveau n'a pas été renseigné.").Send() + err := resp.SetMessage("Le niveau n'a pas été renseigné.").Send() if err != nil { utils.SendAlert("commands/config.go - Level not set", err.Error()) } @@ -101,7 +99,7 @@ func ConfigXP(s *discordgo.Session, i *discordgo.InteractionCreate) { } level := lvl.IntValue() if level < 1 { - err := resp.Message("Le niveau doit forcément être supérieur à 0.").Send() + err := resp.SetMessage("Le niveau doit forcément être supérieur à 0.").Send() if err != nil { utils.SendAlert("commands/config.go - Invalid level", err.Error()) } @@ -110,7 +108,7 @@ func ConfigXP(s *discordgo.Session, i *discordgo.InteractionCreate) { xp := exp.LevelXP(uint(level)) r, ok := optMap["role"] if !ok { - err := resp.Message("Le rôle n'a pas été renseigné.").Send() + err := resp.SetMessage("Le rôle n'a pas été renseigné.").Send() if err != nil { utils.SendAlert("commands/config.go - Role not set", err.Error()) } @@ -125,7 +123,7 @@ func ConfigXP(s *discordgo.Session, i *discordgo.InteractionCreate) { case "add": for _, r := range cfg.XpRoles { if r.RoleID == role.ID { - err = resp.Message("Le rôle est déjà présent dans la config").Send() + err = resp.SetMessage("Le rôle est déjà présent dans la config").Send() if err != nil { utils.SendAlert("commands/config.go - Role already in config", err.Error()) } @@ -152,7 +150,7 @@ func ConfigXP(s *discordgo.Session, i *discordgo.InteractionCreate) { case "del": _, r := cfg.FindXpRole(role.ID) if r == nil { - err = resp.Message("Le rôle n'a pas été trouvé dans la config.").Send() + err = resp.SetMessage("Le rôle n'a pas été trouvé dans la config.").Send() if err != nil { utils.SendAlert("commands/config.go - Role not found (del)", err.Error()) } @@ -174,7 +172,7 @@ func ConfigXP(s *discordgo.Session, i *discordgo.InteractionCreate) { case "edit": _, r := cfg.FindXpRole(role.ID) if r == nil { - err = resp.Message("Le rôle n'a pas été trouvé dans la config.").Send() + err = resp.SetMessage("Le rôle n'a pas été trouvé dans la config.").Send() if err != nil { utils.SendAlert("commands/config.go - Role not found (edit)", err.Error()) } @@ -195,16 +193,16 @@ func ConfigXP(s *discordgo.Session, i *discordgo.InteractionCreate) { ) } default: - err = resp.Message("Le type d'action n'est pas valide.").Send() + err = resp.SetMessage("Le type d'action n'est pas valide.").Send() if err != nil { utils.SendAlert("commands/config.go - Invalid action type", err.Error()) } return } if err != nil { - err = resp.Message("Il y a eu une erreur lors de la modification de de la base de données.").Send() + err = resp.SetMessage("Il y a eu une erreur lors de la modification de de la base de données.").Send() } else { - err = resp.Message("La configuration a bien été mise à jour.").Send() + err = resp.SetMessage("La configuration a bien été mise à jour.").Send() } if err != nil { utils.SendAlert("commands/config.go - Config updated message", err.Error()) @@ -217,7 +215,7 @@ func ConfigChannel(s *discordgo.Session, i *discordgo.InteractionCreate) { // verify every args t, ok := optMap["type"] if !ok { - err := resp.Message("Le type d'action n'a pas été renseigné.").Send() + err := resp.SetMessage("Le type d'action n'a pas été renseigné.").Send() if err != nil { utils.SendAlert("commands/config.go - Action type not set", err.Error()) } @@ -226,7 +224,7 @@ func ConfigChannel(s *discordgo.Session, i *discordgo.InteractionCreate) { ts := t.StringValue() salon, ok := optMap["channel"] if !ok { - err := resp.Message("Le salon n'a pas été renseigné.").Send() + err := resp.SetMessage("Le salon n'a pas été renseigné.").Send() if err != nil { utils.SendAlert("commands/config.go - Channel not set (disabled)", err.Error()) } @@ -237,7 +235,7 @@ func ConfigChannel(s *discordgo.Session, i *discordgo.InteractionCreate) { switch ts { case "add": if strings.Contains(cfg.DisabledChannels, channel.ID) { - err := resp.Message("Le salon est déjà dans la liste des salons désactivés").Send() + err := resp.SetMessage("Le salon est déjà dans la liste des salons désactivés").Send() if err != nil { utils.SendAlert("commands/config.go - Channel already disabled", err.Error()) } @@ -246,7 +244,7 @@ func ConfigChannel(s *discordgo.Session, i *discordgo.InteractionCreate) { cfg.DisabledChannels += channel.ID + ";" case "del": if !strings.Contains(cfg.DisabledChannels, channel.ID) { - err := resp.Message("Le salon n'est pas désactivé").Send() + err := resp.SetMessage("Le salon n'est pas désactivé").Send() if err != nil { utils.SendAlert("commands/config.go - Channel not disabled", err.Error()) } @@ -254,7 +252,7 @@ func ConfigChannel(s *discordgo.Session, i *discordgo.InteractionCreate) { } cfg.DisabledChannels = strings.ReplaceAll(cfg.DisabledChannels, channel.ID+";", "") default: - err := resp.Message("Le type d'action n'est pas valide.").Send() + err := resp.SetMessage("Le type d'action n'est pas valide.").Send() if err != nil { utils.SendAlert("commands/config.go - Invalid action type", err.Error()) } @@ -273,9 +271,9 @@ func ConfigChannel(s *discordgo.Session, i *discordgo.InteractionCreate) { "channel_id", channel.ID, ) - err = resp.Message("Il y a eu une erreur lors de la modification de de la base de données.").Send() + err = resp.SetMessage("Il y a eu une erreur lors de la modification de de la base de données.").Send() } else { - err = resp.Message("Modification sauvegardé.").Send() + err = resp.SetMessage("Modification sauvegardé.").Send() } if err != nil { utils.SendAlert("commands/config.go - Modification saved message", err.Error()) @@ -288,7 +286,7 @@ func ConfigFallbackChannel(s *discordgo.Session, i *discordgo.InteractionCreate) // verify every args salon, ok := optMap["channel"] if !ok { - err := resp.Message("Le salon n'a pas été renseigné.").Send() + err := resp.SetMessage("Le salon n'a pas été renseigné.").Send() if err != nil { utils.SendAlert("commands/config.go - Channel not set (fallback)", err.Error()) } @@ -296,7 +294,7 @@ func ConfigFallbackChannel(s *discordgo.Session, i *discordgo.InteractionCreate) } channel := salon.ChannelValue(s) if channel.Type != discordgo.ChannelTypeGuildText { - err := resp.Message("Le salon n'est pas un salon textuel.").Send() + err := resp.SetMessage("Le salon n'est pas un salon textuel.").Send() if err != nil { utils.SendAlert("commands/config.go - Invalid channel type", err.Error()) } @@ -315,9 +313,9 @@ func ConfigFallbackChannel(s *discordgo.Session, i *discordgo.InteractionCreate) "channel_id", channel.ID, ) - err = resp.Message("Il y a eu une erreur lors de la modification de de la base de données.").Send() + err = resp.SetMessage("Il y a eu une erreur lors de la modification de de la base de données.").Send() } else { - err = resp.Message("Salon enregistré.").Send() + err = resp.SetMessage("Salon enregistré.").Send() } if err != nil { utils.SendAlert("commands/config.go - Channel saved message", err.Error()) @@ -330,7 +328,7 @@ func ConfigPeriodBeforeReduce(s *discordgo.Session, i *discordgo.InteractionCrea // verify every args days, ok := optMap["days"] if !ok { - err := resp.Message("Le nombre de jours n'a pas été renseigné.").Send() + err := resp.SetMessage("Le nombre de jours n'a pas été renseigné.").Send() if err != nil { utils.SendAlert("commands/config.go - Days not set (fallback)", err.Error()) } @@ -338,7 +336,7 @@ func ConfigPeriodBeforeReduce(s *discordgo.Session, i *discordgo.InteractionCrea } d := days.IntValue() if d < 30 { - err := resp.Message("Le nombre de jours est inférieur à 30.").Send() + err := resp.SetMessage("Le nombre de jours est inférieur à 30.").Send() if err != nil { utils.SendAlert("commands/config.go - Days < 30 (fallback)", err.Error()) } @@ -357,9 +355,9 @@ func ConfigPeriodBeforeReduce(s *discordgo.Session, i *discordgo.InteractionCrea "days", d, ) - err = resp.Message("Il y a eu une erreur lors de la modification de de la base de données.").Send() + err = resp.SetMessage("Il y a eu une erreur lors de la modification de de la base de données.").Send() } else { - err = resp.Message("Nombre de jours enregistré.").Send() + err = resp.SetMessage("Nombre de jours enregistré.").Send() } if err != nil { utils.SendAlert("commands/config.go - Days saved message", err.Error()) diff --git a/commands/credits.go b/commands/credits.go index 62bbcac..1914950 100644 --- a/commands/credits.go +++ b/commands/credits.go @@ -7,28 +7,27 @@ import ( func Credits(s *discordgo.Session, i *discordgo.InteractionCreate) { resp := utils.NewResponseBuilder(s, i) - err := resp.Embeds([]*discordgo.MessageEmbed{ - { - Type: discordgo.EmbedTypeRich, - Title: "Crédits", - Description: "Auteur du bot : @anhgelus (https://github.com/anhgelus)\nLangage : Go 1.24\nLicence : AGPLv3", - Color: utils.Success, - Fields: []*discordgo.MessageEmbedField{ - { - Name: "anhgelus/gokord", - Value: "v0.6.3 - MPL 2.0", - Inline: true, - }, - { - Name: "bwmarrin/discordgo", - Value: "v0.28.1 - BSD-3-Clause", - Inline: true, - }, - { - Name: "redis/go-redis/v9", - Value: "v9.8.0 - BSD-2-Clause", - Inline: true, - }, + err := resp.AddEmbed(&discordgo.MessageEmbed{ + + Type: discordgo.EmbedTypeRich, + Title: "Crédits", + Description: "Auteur du bot : @anhgelus (https://github.com/anhgelus)\nLangage : Go 1.24\nLicence : AGPLv3", + Color: utils.Success, + Fields: []*discordgo.MessageEmbedField{ + { + Name: "anhgelus/gokord", + Value: "v0.9.0 - MPL 2.0", + Inline: true, + }, + { + Name: "bwmarrin/discordgo", + Value: "v0.29.0 - BSD-3-Clause", + Inline: true, + }, + { + Name: "redis/go-redis/v9", + Value: "v9.8.0 - BSD-2-Clause", + Inline: true, }, }, }).Send() diff --git a/commands/rank.go b/commands/rank.go index d577299..293dae4 100644 --- a/commands/rank.go +++ b/commands/rank.go @@ -18,7 +18,7 @@ func Rank(s *discordgo.Session, i *discordgo.InteractionCreate) { if v, ok := optMap["copaing"]; ok { u := v.UserValue(s) if u.Bot { - err = resp.Message("Imagine si les bots avaient un niveau :rolling_eyes:").IsEphemeral().Send() + err = resp.SetMessage("Imagine si les bots avaient un niveau :rolling_eyes:").IsEphemeral().Send() if err != nil { utils.SendAlert("commands/rank.go - Reply error user is a bot", err.Error()) } @@ -33,7 +33,7 @@ func Rank(s *discordgo.Session, i *discordgo.InteractionCreate) { "guild_id", i.GuildID, ) - err = resp.Message("Erreur : impossible de récupérer le membre").IsEphemeral().Send() + err = resp.SetMessage("Erreur : impossible de récupérer le membre").IsEphemeral().Send() if err != nil { utils.SendAlert("commands/rank.go - Reply error fetching guild member", err.Error()) } @@ -52,7 +52,7 @@ func Rank(s *discordgo.Session, i *discordgo.InteractionCreate) { "guild_id", i.GuildID, ) - err = resp.Message("Erreur : impossible de récupérer l'XP").IsEphemeral().Send() + err = resp.SetMessage("Erreur : impossible de récupérer l'XP").IsEphemeral().Send() if err != nil { utils.SendAlert("commands/rank.go - Reply error fetching xp", err.Error()) } @@ -60,7 +60,7 @@ func Rank(s *discordgo.Session, i *discordgo.InteractionCreate) { } lvl := exp.Level(xp) nxtLvlXP := exp.LevelXP(lvl + 1) - err = resp.Message(fmt.Sprintf( + err = resp.SetMessage(fmt.Sprintf( "%s : **%d**\n> XP : %d\n> Prochain niveau dans %d XP", msg, lvl, diff --git a/commands/reset.go b/commands/reset.go index 20b15ea..ba9367a 100644 --- a/commands/reset.go +++ b/commands/reset.go @@ -10,7 +10,7 @@ import ( func Reset(s *discordgo.Session, i *discordgo.InteractionCreate) { var copaings []*user.Copaing gokord.DB.Where("guild_id = ?", i.GuildID).Delete(&copaings) - if err := utils.NewResponseBuilder(s, i).IsEphemeral().Message("L'XP a été reset.").Send(); err != nil { + if err := utils.NewResponseBuilder(s, i).IsEphemeral().SetMessage("L'XP a été reset.").Send(); err != nil { utils.SendAlert("commands/reset.go - Sending success (all)", err.Error()) } } @@ -20,14 +20,14 @@ func ResetUser(s *discordgo.Session, i *discordgo.InteractionCreate) { optMap := utils.GenerateOptionMap(i) v, ok := optMap["user"] if !ok { - if err := resp.Message("Le user n'a pas été renseigné.").Send(); err != nil { + if err := resp.SetMessage("Le user n'a pas été renseigné.").Send(); err != nil { utils.SendAlert("commands/reset.go - Copaing not set", err.Error()) } return } m := v.UserValue(s) if m.Bot { - if err := resp.Message("Les bots n'ont pas de niveau :upside_down:").Send(); err != nil { + if err := resp.SetMessage("Les bots n'ont pas de niveau :upside_down:").Send(); err != nil { utils.SendAlert("commands/reset.go - Copaing not set", err.Error()) } return @@ -35,12 +35,12 @@ func ResetUser(s *discordgo.Session, i *discordgo.InteractionCreate) { err := user.GetCopaing(m.ID, i.GuildID).Delete() if err != nil { utils.SendAlert("commands/reset.go - Copaing not deleted", err.Error(), "discord_id", m.ID, "guild_id", i.GuildID) - err = resp.Message("Erreur : impossible de reset l'utilisateur").Send() + err = resp.SetMessage("Erreur : impossible de reset l'utilisateur").Send() if err != nil { utils.SendAlert("commands/reset.go - Error deleting", err.Error()) } } - if err = resp.Message("Le user bien été reset.").Send(); err != nil { + if err = resp.SetMessage("Le user bien été reset.").Send(); err != nil { utils.SendAlert("commands/reset.go - Sending success (user)", err.Error()) } } diff --git a/commands/top.go b/commands/top.go index 5a20091..d0e898d 100644 --- a/commands/top.go +++ b/commands/top.go @@ -49,9 +49,12 @@ func Top(s *discordgo.Session, i *discordgo.InteractionCreate) { go func() { wg.Wait() if cfg.DaysXPRemains > 30 { - resp.Embeds(embeds) + resp.AddEmbed(embeds[0]). + AddEmbed(embeds[1]). + AddEmbed(embeds[2]) } else { - resp.Embeds(embeds[1:]) + resp.AddEmbed(embeds[1]). + AddEmbed(embeds[2]) } err = resp.Send() if err != nil { diff --git a/go.mod b/go.mod index 11f5843..941d9a1 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,11 @@ module github.com/anhgelus/les-copaings-bot go 1.24 require ( - github.com/anhgelus/gokord v0.7.0 - github.com/bwmarrin/discordgo v0.28.1 + github.com/anhgelus/gokord v0.9.0 + github.com/bwmarrin/discordgo v0.29.0 github.com/pelletier/go-toml/v2 v2.2.4 gorm.io/driver/postgres v1.5.11 - gorm.io/gorm v1.26.1 + gorm.io/gorm v1.30.0 ) require ( @@ -20,7 +20,7 @@ require ( github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/redis/go-redis/v9 v9.8.0 // indirect + github.com/redis/go-redis/v9 v9.9.0 // indirect golang.org/x/crypto v0.38.0 // indirect golang.org/x/sync v0.14.0 // indirect golang.org/x/sys v0.33.0 // indirect diff --git a/go.sum b/go.sum index ab9f091..45ff634 100644 --- a/go.sum +++ b/go.sum @@ -1,11 +1,15 @@ github.com/anhgelus/gokord v0.7.0 h1:G9GrxD3/xEreXsiz3etKxbeHsNHrwT5I/VEKSWpyrj4= github.com/anhgelus/gokord v0.7.0/go.mod h1:SfGKyMMGjNS9F9ehiEb5Cc58P+uoDdLDGGYqXSiMCus= +github.com/anhgelus/gokord v0.9.0 h1:vz7jHZ6papdt/xehe+nx4DxOLquPO6QukW8UzH81bGY= +github.com/anhgelus/gokord v0.9.0/go.mod h1:NSepHjTV61LUnuyGgHxEhZNMnWREErGFyOtRYPgdx/E= github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= github.com/bwmarrin/discordgo v0.28.1 h1:gXsuo2GBO7NbR6uqmrrBDplPUx2T3nzu775q/Rd1aG4= github.com/bwmarrin/discordgo v0.28.1/go.mod h1:NJZpH+1AfhIcyQsPeuBKsUtYrRnjkyu0kIVMCHkZtRY= +github.com/bwmarrin/discordgo v0.29.0 h1:FmWeXFaKUwrcL3Cx65c20bTRW+vOb6k8AnaP+EgjDno= +github.com/bwmarrin/discordgo v0.29.0/go.mod h1:NJZpH+1AfhIcyQsPeuBKsUtYrRnjkyu0kIVMCHkZtRY= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -34,6 +38,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/redis/go-redis/v9 v9.8.0 h1:q3nRvjrlge/6UD7eTu/DSg2uYiU2mCL0G/uzBWqhicI= github.com/redis/go-redis/v9 v9.8.0/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw= +github.com/redis/go-redis/v9 v9.9.0 h1:URbPQ4xVQSQhZ27WMQVmZSo3uT3pL+4IdHVcYq2nVfM= +github.com/redis/go-redis/v9 v9.9.0/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -61,3 +67,5 @@ gorm.io/driver/postgres v1.5.11 h1:ubBVAfbKEUld/twyKZ0IYn9rSQh448EdelLYk9Mv314= gorm.io/driver/postgres v1.5.11/go.mod h1:DX3GReXH+3FPWGrrgffdvCk3DQ1dwDPdmbenSkweRGI= gorm.io/gorm v1.26.1 h1:ghB2gUI9FkS46luZtn6DLZ0f6ooBJ5IbVej2ENFDjRw= gorm.io/gorm v1.26.1/go.mod h1:8Z33v652h4//uMA76KjeDH8mJXPm1QNCYrMeatR0DOE= +gorm.io/gorm v1.30.0 h1:qbT5aPv1UH8gI99OsRlvDToLxW5zR7FzS9acZDOZcgs= +gorm.io/gorm v1.30.0/go.mod h1:8Z33v652h4//uMA76KjeDH8mJXPm1QNCYrMeatR0DOE= From 48eb4410ad14d74b3f1925d263b8fe32c472a648 Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Wed, 4 Jun 2025 15:11:16 +0200 Subject: [PATCH 04/10] build(gokord): upgrade to 0.10.0 --- commands/config.go | 23 +++++++++-------------- commands/credits.go | 9 ++++----- commands/rank.go | 4 +--- commands/reset.go | 9 ++++----- commands/top.go | 5 ++--- go.mod | 2 +- go.sum | 2 ++ 7 files changed, 23 insertions(+), 31 deletions(-) diff --git a/commands/config.go b/commands/config.go index 35d48be..48d7ab8 100644 --- a/commands/config.go +++ b/commands/config.go @@ -10,9 +10,8 @@ import ( "strings" ) -func ConfigShow(s *discordgo.Session, i *discordgo.InteractionCreate) { +func ConfigShow(s *discordgo.Session, i *discordgo.InteractionCreate, optMap utils.OptionMap, resp *utils.ResponseBuilder) { cfg := config.GetGuildConfig(i.GuildID) - resp := utils.NewResponseBuilder(s, i) roles := "" l := len(cfg.XpRoles) - 1 for i, r := range cfg.XpRoles { @@ -76,9 +75,8 @@ func ConfigShow(s *discordgo.Session, i *discordgo.InteractionCreate) { } } -func ConfigXP(s *discordgo.Session, i *discordgo.InteractionCreate) { - optMap := utils.GenerateOptionMapForSubcommand(i) - resp := utils.NewResponseBuilder(s, i).IsEphemeral() +func ConfigXP(s *discordgo.Session, i *discordgo.InteractionCreate, optMap utils.OptionMap, resp *utils.ResponseBuilder) { + resp.IsEphemeral() // verify every args t, ok := optMap["type"] if !ok { @@ -209,9 +207,8 @@ func ConfigXP(s *discordgo.Session, i *discordgo.InteractionCreate) { } } -func ConfigChannel(s *discordgo.Session, i *discordgo.InteractionCreate) { - optMap := utils.GenerateOptionMapForSubcommand(i) - resp := utils.NewResponseBuilder(s, i).IsEphemeral() +func ConfigChannel(s *discordgo.Session, i *discordgo.InteractionCreate, optMap utils.OptionMap, resp *utils.ResponseBuilder) { + resp.IsEphemeral() // verify every args t, ok := optMap["type"] if !ok { @@ -280,9 +277,8 @@ func ConfigChannel(s *discordgo.Session, i *discordgo.InteractionCreate) { } } -func ConfigFallbackChannel(s *discordgo.Session, i *discordgo.InteractionCreate) { - optMap := utils.GenerateOptionMapForSubcommand(i) - resp := utils.NewResponseBuilder(s, i).IsEphemeral() +func ConfigFallbackChannel(s *discordgo.Session, i *discordgo.InteractionCreate, optMap utils.OptionMap, resp *utils.ResponseBuilder) { + resp.IsEphemeral() // verify every args salon, ok := optMap["channel"] if !ok { @@ -322,9 +318,8 @@ func ConfigFallbackChannel(s *discordgo.Session, i *discordgo.InteractionCreate) } } -func ConfigPeriodBeforeReduce(s *discordgo.Session, i *discordgo.InteractionCreate) { - optMap := utils.GenerateOptionMapForSubcommand(i) - resp := utils.NewResponseBuilder(s, i).IsEphemeral() +func ConfigPeriodBeforeReduce(s *discordgo.Session, i *discordgo.InteractionCreate, optMap utils.OptionMap, resp *utils.ResponseBuilder) { + resp.IsEphemeral() // verify every args days, ok := optMap["days"] if !ok { diff --git a/commands/credits.go b/commands/credits.go index 1914950..0943761 100644 --- a/commands/credits.go +++ b/commands/credits.go @@ -5,8 +5,7 @@ import ( "github.com/bwmarrin/discordgo" ) -func Credits(s *discordgo.Session, i *discordgo.InteractionCreate) { - resp := utils.NewResponseBuilder(s, i) +func Credits(s *discordgo.Session, i *discordgo.InteractionCreate, optMap utils.OptionMap, resp *utils.ResponseBuilder) { err := resp.AddEmbed(&discordgo.MessageEmbed{ Type: discordgo.EmbedTypeRich, @@ -16,7 +15,7 @@ func Credits(s *discordgo.Session, i *discordgo.InteractionCreate) { Fields: []*discordgo.MessageEmbedField{ { Name: "anhgelus/gokord", - Value: "v0.9.0 - MPL 2.0", + Value: "v0.10.0 - MPL 2.0", Inline: true, }, { @@ -25,8 +24,8 @@ func Credits(s *discordgo.Session, i *discordgo.InteractionCreate) { Inline: true, }, { - Name: "redis/go-redis/v9", - Value: "v9.8.0 - BSD-2-Clause", + Name: "gorm", + Value: "v1.30.0 - MIT", Inline: true, }, }, diff --git a/commands/rank.go b/commands/rank.go index 293dae4..dd5859a 100644 --- a/commands/rank.go +++ b/commands/rank.go @@ -8,13 +8,11 @@ import ( "github.com/bwmarrin/discordgo" ) -func Rank(s *discordgo.Session, i *discordgo.InteractionCreate) { - optMap := utils.GenerateOptionMap(i) +func Rank(s *discordgo.Session, i *discordgo.InteractionCreate, optMap utils.OptionMap, resp *utils.ResponseBuilder) { c := user.GetCopaing(i.Member.User.ID, i.GuildID) // current user = member who used /rank msg := "Votre niveau" m := i.Member var err error - resp := utils.NewResponseBuilder(s, i) if v, ok := optMap["copaing"]; ok { u := v.UserValue(s) if u.Bot { diff --git a/commands/reset.go b/commands/reset.go index ba9367a..c4275a0 100644 --- a/commands/reset.go +++ b/commands/reset.go @@ -7,17 +7,16 @@ import ( "github.com/bwmarrin/discordgo" ) -func Reset(s *discordgo.Session, i *discordgo.InteractionCreate) { +func Reset(s *discordgo.Session, i *discordgo.InteractionCreate, optMap utils.OptionMap, resp *utils.ResponseBuilder) { var copaings []*user.Copaing gokord.DB.Where("guild_id = ?", i.GuildID).Delete(&copaings) - if err := utils.NewResponseBuilder(s, i).IsEphemeral().SetMessage("L'XP a été reset.").Send(); err != nil { + if err := resp.IsEphemeral().SetMessage("L'XP a été reset.").Send(); err != nil { utils.SendAlert("commands/reset.go - Sending success (all)", err.Error()) } } -func ResetUser(s *discordgo.Session, i *discordgo.InteractionCreate) { - resp := utils.NewResponseBuilder(s, i).IsEphemeral() - optMap := utils.GenerateOptionMap(i) +func ResetUser(s *discordgo.Session, i *discordgo.InteractionCreate, optMap utils.OptionMap, resp *utils.ResponseBuilder) { + resp.IsEphemeral() v, ok := optMap["user"] if !ok { if err := resp.SetMessage("Le user n'a pas été renseigné.").Send(); err != nil { diff --git a/commands/top.go b/commands/top.go index d0e898d..daa1ccb 100644 --- a/commands/top.go +++ b/commands/top.go @@ -10,9 +10,8 @@ import ( "sync" ) -func Top(s *discordgo.Session, i *discordgo.InteractionCreate) { - resp := utils.NewResponseBuilder(s, i).IsDeferred() - err := resp.Send() +func Top(s *discordgo.Session, i *discordgo.InteractionCreate, optMap utils.OptionMap, resp *utils.ResponseBuilder) { + err := resp.IsDeferred().Send() if err != nil { utils.SendAlert("commands/top.go - Sending deferred", err.Error()) return diff --git a/go.mod b/go.mod index 941d9a1..1321ae7 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/anhgelus/les-copaings-bot go 1.24 require ( - github.com/anhgelus/gokord v0.9.0 + github.com/anhgelus/gokord v0.10.0 github.com/bwmarrin/discordgo v0.29.0 github.com/pelletier/go-toml/v2 v2.2.4 gorm.io/driver/postgres v1.5.11 diff --git a/go.sum b/go.sum index 45ff634..fb058ce 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ github.com/anhgelus/gokord v0.7.0 h1:G9GrxD3/xEreXsiz3etKxbeHsNHrwT5I/VEKSWpyrj4 github.com/anhgelus/gokord v0.7.0/go.mod h1:SfGKyMMGjNS9F9ehiEb5Cc58P+uoDdLDGGYqXSiMCus= github.com/anhgelus/gokord v0.9.0 h1:vz7jHZ6papdt/xehe+nx4DxOLquPO6QukW8UzH81bGY= github.com/anhgelus/gokord v0.9.0/go.mod h1:NSepHjTV61LUnuyGgHxEhZNMnWREErGFyOtRYPgdx/E= +github.com/anhgelus/gokord v0.10.0 h1:FaaMWntaezmSCvarcSMjfWr5OXVVwwzlDMnNX8gXaWE= +github.com/anhgelus/gokord v0.10.0/go.mod h1:NSepHjTV61LUnuyGgHxEhZNMnWREErGFyOtRYPgdx/E= github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= From defc781f9a66b0fe25a79356ac5ac0c2143003f9 Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Thu, 5 Jun 2025 15:17:45 +0200 Subject: [PATCH 05/10] fix(xp): adding xp if user joins a disabled voice channel in certain conditions --- events.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/events.go b/events.go index 50306dc..fc60ba0 100644 --- a/events.go +++ b/events.go @@ -51,12 +51,12 @@ func OnVoiceUpdate(s *discordgo.Session, e *discordgo.VoiceStateUpdate) { return } cfg := config.GetGuildConfig(e.GuildID) - if e.BeforeUpdate == nil && e.ChannelID != "" { + if (e.BeforeUpdate == nil || cfg.IsDisabled(e.BeforeUpdate.ChannelID)) && e.ChannelID != "" { if cfg.IsDisabled(e.ChannelID) { return } onConnection(s, e) - } else if e.BeforeUpdate != nil && e.ChannelID == "" { + } else if e.BeforeUpdate != nil && (e.ChannelID == "" || cfg.IsDisabled(e.ChannelID)) { if cfg.IsDisabled(e.BeforeUpdate.ChannelID) { return } @@ -73,8 +73,8 @@ func onDisconnect(s *discordgo.Session, e *discordgo.VoiceStateUpdate) { now := time.Now().Unix() c := user.GetCopaing(e.UserID, e.GuildID) // check the validity of user - con := connectedSince[e.UserID] - if con == NotConnected { + con, ok := connectedSince[e.UserID] + if !ok || con == NotConnected { utils.SendWarn(fmt.Sprintf( "User %s diconnect from a vocal but was registered as not connected", e.Member.DisplayName(), )) From 59121afa2b5ddf9fc412e665da97784a7b92de69 Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Thu, 5 Jun 2025 15:20:02 +0200 Subject: [PATCH 06/10] fix(xp): not supporting multi server for vocal --- events.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/events.go b/events.go index fc60ba0..3e55e4b 100644 --- a/events.go +++ b/events.go @@ -64,16 +64,20 @@ func OnVoiceUpdate(s *discordgo.Session, e *discordgo.VoiceStateUpdate) { } } +func genMapKey(guildID string, userID string) string { + return fmt.Sprintf("%s:%s", guildID, userID) +} + func onConnection(_ *discordgo.Session, e *discordgo.VoiceStateUpdate) { utils.SendDebug("User connected", "username", e.Member.DisplayName()) - connectedSince[e.UserID] = time.Now().Unix() + connectedSince[genMapKey(e.GuildID, e.UserID)] = time.Now().Unix() } func onDisconnect(s *discordgo.Session, e *discordgo.VoiceStateUpdate) { now := time.Now().Unix() c := user.GetCopaing(e.UserID, e.GuildID) // check the validity of user - con, ok := connectedSince[e.UserID] + con, ok := connectedSince[genMapKey(e.GuildID, e.UserID)] if !ok || con == NotConnected { utils.SendWarn(fmt.Sprintf( "User %s diconnect from a vocal but was registered as not connected", e.Member.DisplayName(), @@ -82,7 +86,7 @@ func onDisconnect(s *discordgo.Session, e *discordgo.VoiceStateUpdate) { } timeInVocal := now - con utils.SendDebug("User disconnected", "username", e.Member.DisplayName(), "time in vocal", timeInVocal) - connectedSince[e.UserID] = NotConnected + connectedSince[genMapKey(e.GuildID, e.UserID)] = NotConnected // add exp if timeInVocal < 0 { utils.SendAlert( From 32c9c22b1468511cfeb38adef17aad4f1120425e Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Thu, 5 Jun 2025 15:20:34 +0200 Subject: [PATCH 07/10] build(gokord): bump bot version to 3.1.3 --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index 7f0c64f..91b7d9d 100644 --- a/main.go +++ b/main.go @@ -19,7 +19,7 @@ var ( Version = gokord.Version{ Major: 3, Minor: 1, - Patch: 2, + Patch: 3, } stopPeriodicReducer chan<- interface{} From 977c818328c1c14880029510c6b3742a12858dcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Herg=C3=A8s?= Date: Sun, 20 Jul 2025 15:51:15 +0200 Subject: [PATCH 08/10] feat(config): load .env file for default cli values --- go.mod | 1 + go.sum | 2 ++ main.go | 9 ++++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 1321ae7..16d6af9 100644 --- a/go.mod +++ b/go.mod @@ -20,6 +20,7 @@ require ( github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect + github.com/joho/godotenv v1.5.1 // indirect github.com/redis/go-redis/v9 v9.9.0 // indirect golang.org/x/crypto v0.38.0 // indirect golang.org/x/sync v0.14.0 // indirect diff --git a/go.sum b/go.sum index fb058ce..0b8314f 100644 --- a/go.sum +++ b/go.sum @@ -34,6 +34,8 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= +github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= diff --git a/main.go b/main.go index 91b7d9d..4610bc4 100644 --- a/main.go +++ b/main.go @@ -2,6 +2,7 @@ package main import ( _ "embed" + "errors" "flag" "github.com/anhgelus/gokord" "github.com/anhgelus/gokord/utils" @@ -9,6 +10,8 @@ import ( "github.com/anhgelus/les-copaings-bot/config" "github.com/anhgelus/les-copaings-bot/user" "github.com/bwmarrin/discordgo" + "github.com/joho/godotenv" + "os" "time" ) @@ -26,7 +29,11 @@ var ( ) func init() { - flag.StringVar(&token, "token", "", "token of the bot") + err := godotenv.Load() + if err != nil && !errors.Is(err, os.ErrNotExist) { + utils.SendWarn("Error while loading .env file", "error", err.Error()) + } + flag.StringVar(&token, "token", os.Getenv("TOKEN"), "token of the bot") } func main() { From cf2093095e769cdfac7fd83adc61d7ff6e958c0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Herg=C3=A8s?= Date: Mon, 4 Aug 2025 13:21:32 +0200 Subject: [PATCH 09/10] refactor(xp): use own trim function for next gokord update --- events.go | 2 +- exp/functions.go | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/events.go b/events.go index 3e55e4b..e5fd37a 100644 --- a/events.go +++ b/events.go @@ -31,7 +31,7 @@ func OnMessage(s *discordgo.Session, m *discordgo.MessageCreate) { } c := user.GetCopaing(m.Author.ID, m.GuildID) // add exp - trimmed := utils.TrimMessage(strings.ToLower(m.Content)) + trimmed := exp.TrimMessage(strings.ToLower(m.Content)) m.Member.User = m.Author m.Member.GuildID = m.GuildID xp := min(exp.MessageXP(uint(len(trimmed)), exp.CalcDiversity(trimmed)), MaxXpPerMessage) diff --git a/exp/functions.go b/exp/functions.go index 119b6a8..026eb34 100644 --- a/exp/functions.go +++ b/exp/functions.go @@ -4,7 +4,9 @@ import ( "fmt" "github.com/anhgelus/gokord" "math" + "regexp" "slices" + "strings" "time" ) @@ -57,3 +59,15 @@ func TimeStampNDaysBefore(n uint) string { } return fmt.Sprintf("%d-%d-%d", y, m, d) } + +func TrimMessage(s string) string { + not := regexp.MustCompile("[^a-zA-Z0-9éèêàùûç,;:!.?]") + ping := regexp.MustCompile("<(@&?|#)[0-9]{18}>") + link := regexp.MustCompile("https?://[a-zA-Z0-9.]+[.][a-z]+.*") + + s = ping.ReplaceAllLiteralString(s, "") + s = link.ReplaceAllLiteralString(s, "") + s = not.ReplaceAllLiteralString(s, "") + + return strings.Trim(s, " ") +} From 026abcc07a57eeda8a08a746ad2b664e956360f3 Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Mon, 18 Aug 2025 13:56:32 +0200 Subject: [PATCH 10/10] feat(xp): increase precision of timestamp seems like to fix periodic reducer not working --- .gitignore | 1 + docker-compose.yml | 22 ---------------------- exp/functions.go | 10 +++++----- main.go | 10 +++++++++- user/level.go | 10 +++++----- 5 files changed, 20 insertions(+), 33 deletions(-) delete mode 100644 docker-compose.yml diff --git a/.gitignore b/.gitignore index 7cc06cf..c8977f6 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ go.work tmp config/**.toml data +docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 77b28da..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,22 +0,0 @@ -services: - bot: - build: . - restart: always - env_file: - - .env - volumes: - - ./config:/app/config - depends_on: - - postgres - postgres: - image: postgres:alpine - env_file: - - .env - volumes: - - ./data:/var/lib/postgresql/data - adminer: - image: docker.io/adminer - ports: - - "8080:8080" - depends_on: - - postgres diff --git a/exp/functions.go b/exp/functions.go index 026eb34..c20e6a8 100644 --- a/exp/functions.go +++ b/exp/functions.go @@ -50,14 +50,14 @@ func LevelXP(level uint) uint { // TimeStampNDaysBefore returns the timestamp (year-month-day) n days before today func TimeStampNDaysBefore(n uint) string { - var y, d int - var m time.Month + var unix time.Time if gokord.Debug { - y, m, d = time.Unix(time.Now().Unix()-int64(24*60*60), 0).Date() // reduce time for debug + unix = time.Unix(time.Now().Unix()-int64(n), 0) // reduce time for debug } else { - y, m, d = time.Unix(time.Now().Unix()-int64(n*24*60*60), 0).Date() + unix = time.Unix(time.Now().Unix()-int64(n*24*60*60), 0) } - return fmt.Sprintf("%d-%d-%d", y, m, d) + unix = unix.UTC() + return fmt.Sprintf("%d-%d-%d %d:%d:%d UTC", unix.Year(), unix.Month(), unix.Day(), unix.Hour(), unix.Minute(), unix.Second()) } func TrimMessage(s string) string { diff --git a/main.go b/main.go index 4610bc4..cfd4b58 100644 --- a/main.go +++ b/main.go @@ -195,7 +195,15 @@ func afterInit(dg *discordgo.Session) { dg.AddHandler(OnVoiceUpdate) dg.AddHandler(OnLeave) - stopPeriodicReducer = utils.NewTimer(24*time.Hour, func(stop chan<- interface{}) { + d := 24 * time.Hour + if gokord.Debug { + d = 24 * time.Second + } + + user.PeriodicReducer(dg) + + stopPeriodicReducer = utils.NewTimer(d, func(stop chan<- interface{}) { + utils.SendDebug("Periodic reducer") user.PeriodicReducer(dg) }) } diff --git a/user/level.go b/user/level.go index 6d9b674..9ef7372 100644 --- a/user/level.go +++ b/user/level.go @@ -86,14 +86,14 @@ func PeriodicReducer(dg *discordgo.Session) { go func() { defer wg.Done() cfg := config.GetGuildConfig(g.ID) - err := gokord.DB. + res := gokord.DB. Model(&CopaingXP{}). Where("guild_id = ? and created_at < ?", g.ID, exp.TimeStampNDaysBefore(cfg.DaysXPRemains)). - Delete(&CopaingXP{}). - Error - if err != nil { - utils.SendAlert("user/level.go - Removing old XP", err.Error(), "guild_id", g.ID) + Delete(&CopaingXP{}) + if res.Error != nil { + utils.SendAlert("user/level.go - Removing old XP", res.Error.Error(), "guild_id", g.ID) } + utils.SendDebug("Guild cleaned", "guild", g.Name, "rows affected", res.RowsAffected) }() } wg.Wait()