aboutsummaryrefslogtreecommitdiff
path: root/commands
diff options
context:
space:
mode:
Diffstat (limited to 'commands')
-rw-r--r--commands/config.go83
-rw-r--r--commands/credits.go26
-rw-r--r--commands/rank.go41
-rw-r--r--commands/reset.go21
-rw-r--r--commands/top.go60
5 files changed, 154 insertions, 77 deletions
diff --git a/commands/config.go b/commands/config.go
index 1e680c7..a3857c6 100644
--- a/commands/config.go
+++ b/commands/config.go
@@ -5,7 +5,7 @@ import (
"github.com/anhgelus/gokord"
"github.com/anhgelus/gokord/utils"
"github.com/anhgelus/les-copaings-bot/config"
- "github.com/anhgelus/les-copaings-bot/xp"
+ "github.com/anhgelus/les-copaings-bot/exp"
"github.com/bwmarrin/discordgo"
"strings"
)
@@ -17,9 +17,9 @@ func ConfigShow(s *discordgo.Session, i *discordgo.InteractionCreate) {
l := len(cfg.XpRoles) - 1
for i, r := range cfg.XpRoles {
if i == l {
- roles += fmt.Sprintf("> Niveau %d - <@&%s>", xp.Level(r.XP), r.RoleID)
+ roles += fmt.Sprintf("> Niveau %d - <@&%s>", exp.Level(r.XP), r.RoleID)
} else {
- roles += fmt.Sprintf("> Niveau %d - <@&%s>\n", xp.Level(r.XP), r.RoleID)
+ roles += fmt.Sprintf("> Niveau %d - <@&%s>\n", exp.Level(r.XP), r.RoleID)
}
}
if len(roles) == 0 {
@@ -38,16 +38,21 @@ func ConfigShow(s *discordgo.Session, i *discordgo.InteractionCreate) {
if len(chans) == 0 {
chans = "Aucun salon désactivé :)"
}
+ var defaultChan string
+ if len(cfg.FallbackChannel) == 0 {
+ defaultChan = "Pas de valeur"
+ } else {
+ defaultChan = fmt.Sprintf("<#%s>", cfg.FallbackChannel)
+ }
err := resp.Embeds([]*discordgo.MessageEmbed{
{
- Type: discordgo.EmbedTypeRich,
- Title: "Config",
- Description: "Configuration",
- Color: utils.Success,
+ Type: discordgo.EmbedTypeRich,
+ Title: "Config",
+ Color: utils.Success,
Fields: []*discordgo.MessageEmbedField{
{
Name: "Salons par défaut",
- Value: fmt.Sprintf("<#%s>", cfg.FallbackChannel),
+ Value: defaultChan,
Inline: false,
},
{
@@ -60,6 +65,11 @@ func ConfigShow(s *discordgo.Session, i *discordgo.InteractionCreate) {
Value: chans,
Inline: false,
},
+ {
+ Name: "Jours avant la réduction",
+ Value: fmt.Sprintf("%d", cfg.DaysXPRemains),
+ Inline: false,
+ },
},
},
}).Send()
@@ -98,7 +108,7 @@ func ConfigXP(s *discordgo.Session, i *discordgo.InteractionCreate) {
}
return
}
- exp := xp.XPForLevel(uint(level))
+ xp := exp.LevelXP(uint(level))
r, ok := optMap["role"]
if !ok {
err := resp.Message("Le rôle n'a pas été renseigné.").Send()
@@ -116,7 +126,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.Message("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())
}
@@ -124,7 +134,7 @@ func ConfigXP(s *discordgo.Session, i *discordgo.InteractionCreate) {
}
}
cfg.XpRoles = append(cfg.XpRoles, config.XpRole{
- XP: exp,
+ XP: xp,
RoleID: role.ID,
})
err = cfg.Save()
@@ -143,7 +153,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.Message("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())
}
@@ -165,13 +175,13 @@ 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.Message("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())
}
return
}
- r.XP = exp
+ r.XP = xp
err = gokord.DB.Save(r).Error
if err != nil {
utils.SendAlert(
@@ -186,7 +196,7 @@ func ConfigXP(s *discordgo.Session, i *discordgo.InteractionCreate) {
)
}
default:
- err := resp.Message("Le type d'action n'est pas valide.").Send()
+ err = resp.Message("Le type d'action n'est pas valide.").Send()
if err != nil {
utils.SendAlert("commands/config.go - Invalid action type", err.Error())
}
@@ -316,3 +326,46 @@ func ConfigFallbackChannel(s *discordgo.Session, i *discordgo.InteractionCreate)
utils.SendAlert("commands/config.go - Channel saved message", err.Error())
}
}
+
+func ConfigPeriodBeforeReduce(s *discordgo.Session, i *discordgo.InteractionCreate) {
+ optMap := utils.GenerateOptionMapForSubcommand(i)
+ resp := utils.ResponseBuilder{C: s, I: i}
+ resp.IsEphemeral()
+ // verify every args
+ days, ok := optMap["days"]
+ if !ok {
+ err := resp.Message("Le nombre de jours n'a pas été renseigné.").Send()
+ if err != nil {
+ utils.SendAlert("commands/config.go - Days not set (fallback)", err.Error())
+ }
+ return
+ }
+ d := days.IntValue()
+ if d < 30 {
+ err := resp.Message("Le nombre de jours est inférieur à 30.").Send()
+ if err != nil {
+ utils.SendAlert("commands/config.go - Days < 30 (fallback)", err.Error())
+ }
+ return
+ }
+ // save
+ cfg := config.GetGuildConfig(i.GuildID)
+ cfg.DaysXPRemains = uint(d)
+ err := cfg.Save()
+ if err != nil {
+ utils.SendAlert(
+ "commands/config.go - Saving config",
+ err.Error(),
+ "guild_id",
+ i.GuildID,
+ "days",
+ d,
+ )
+ err = resp.Message("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()
+ }
+ if err != nil {
+ utils.SendAlert("commands/config.go - Days saved message", err.Error())
+ }
+}
diff --git a/commands/credits.go b/commands/credits.go
index fb26530..d5aa42e 100644
--- a/commands/credits.go
+++ b/commands/credits.go
@@ -11,12 +11,12 @@ func Credits(s *discordgo.Session, i *discordgo.InteractionCreate) {
{
Type: discordgo.EmbedTypeRich,
Title: "Crédits",
- Description: "Auteur du bot : @anhgelus (https://github.com/anhgelus)\nLangage : Go 1.22\nLicence : AGPLv3",
+ 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.3.0 - MPL 2.0",
+ Value: "v0.6.3 - MPL 2.0",
Inline: true,
},
{
@@ -25,28 +25,8 @@ func Credits(s *discordgo.Session, i *discordgo.InteractionCreate) {
Inline: true,
},
{
- Name: "pelletier/go-toml/v2",
- Value: "v2.2.1 - MIT",
- Inline: true,
- },
- {
Name: "redis/go-redis/v9",
- Value: "v9.5.1 - BSD-2-Clause",
- Inline: true,
- },
- {
- Name: "gorm.io/gorm",
- Value: "v1.25.9 - MIT",
- Inline: true,
- },
- {
- Name: "gorm.io/driver/postgres",
- Value: "v1.5.7 - MIT",
- Inline: true,
- },
- {
- Name: "other",
- Value: "Et leurs dépendances !",
+ Value: "v9.8.0 - BSD-2-Clause",
Inline: true,
},
},
diff --git a/commands/rank.go b/commands/rank.go
index 4d6f817..70c0222 100644
--- a/commands/rank.go
+++ b/commands/rank.go
@@ -3,14 +3,14 @@ package commands
import (
"fmt"
"github.com/anhgelus/gokord/utils"
- "github.com/anhgelus/les-copaings-bot/xp"
+ "github.com/anhgelus/les-copaings-bot/exp"
+ "github.com/anhgelus/les-copaings-bot/user"
"github.com/bwmarrin/discordgo"
)
func Rank(s *discordgo.Session, i *discordgo.InteractionCreate) {
optMap := utils.GenerateOptionMap(i)
- c := xp.GetCopaing(i.Member.User.ID, i.GuildID) // current copaing = member who used /rank
- xp.LastEventUpdate(s, c) // update xp and reset last event
+ c := user.GetCopaing(i.Member.User.ID, i.GuildID) // current user = member who used /rank
msg := "Votre niveau"
m := i.Member
var err error
@@ -20,13 +20,13 @@ func Rank(s *discordgo.Session, i *discordgo.InteractionCreate) {
if u.Bot {
err = resp.Message("Imagine si les bots avaient un niveau :rolling_eyes:").IsEphemeral().Send()
if err != nil {
- utils.SendAlert("rank.go - Reply error user is a bot", err.Error())
+ utils.SendAlert("commands/rank.go - Reply error user is a bot", err.Error())
}
}
m, err = s.GuildMember(i.GuildID, u.ID)
if err != nil {
utils.SendAlert(
- "rank.go - Fetching guild member",
+ "commands/rank.go - Fetching guild member",
err.Error(),
"discord_id",
u.ID,
@@ -35,24 +35,39 @@ func Rank(s *discordgo.Session, i *discordgo.InteractionCreate) {
)
err = resp.Message("Erreur : impossible de récupérer le membre").IsEphemeral().Send()
if err != nil {
- utils.SendAlert("rank.go - Reply error fetching guild member", err.Error())
+ utils.SendAlert("commands/rank.go - Reply error fetching guild member", err.Error())
}
return
}
- c = xp.GetCopaing(u.ID, i.GuildID) // current copaing = member targeted by member who wrote /rank
- xp.XPUpdate(s, c) // update xp without resetting event
+ c = user.GetCopaing(u.ID, i.GuildID) // current user = member targeted by member who wrote /rank
msg = fmt.Sprintf("Le niveau de %s", m.DisplayName())
}
- lvl := xp.Level(c.XP)
- nxtLvlXP := xp.XPForLevel(lvl + 1)
+ xp, err := c.GetXP()
+ if err != nil {
+ utils.SendAlert(
+ "commands/rank.go - Fetching xp",
+ err.Error(),
+ "discord_id",
+ c.ID,
+ "guild_id",
+ i.GuildID,
+ )
+ err = resp.Message("Erreur : impossible de récupérer l'XP").IsEphemeral().Send()
+ if err != nil {
+ utils.SendAlert("commands/rank.go - Reply error fetching xp", err.Error())
+ }
+ return
+ }
+ lvl := exp.Level(xp)
+ nxtLvlXP := exp.LevelXP(lvl + 1)
err = resp.Message(fmt.Sprintf(
"%s : **%d**\n> XP : %d\n> Prochain niveau dans %d XP",
msg,
lvl,
- c.XP,
- nxtLvlXP-c.XP,
+ xp,
+ nxtLvlXP-xp,
)).Send()
if err != nil {
- utils.SendAlert("rank.go - Sending rank", err.Error())
+ utils.SendAlert("commands/rank.go - Sending rank", err.Error())
}
}
diff --git a/commands/reset.go b/commands/reset.go
index 0c18044..3f8af03 100644
--- a/commands/reset.go
+++ b/commands/reset.go
@@ -3,12 +3,12 @@ package commands
import (
"github.com/anhgelus/gokord"
"github.com/anhgelus/gokord/utils"
- "github.com/anhgelus/les-copaings-bot/xp"
+ "github.com/anhgelus/les-copaings-bot/user"
"github.com/bwmarrin/discordgo"
)
func Reset(s *discordgo.Session, i *discordgo.InteractionCreate) {
- var copaings []*xp.Copaing
+ var copaings []*user.Copaing
gokord.DB.Where("guild_id = ?", i.GuildID).Delete(&copaings)
resp := utils.ResponseBuilder{C: s, I: i}
if err := resp.IsEphemeral().Message("L'XP a été reset.").Send(); err != nil {
@@ -20,9 +20,9 @@ func ResetUser(s *discordgo.Session, i *discordgo.InteractionCreate) {
resp := utils.ResponseBuilder{C: s, I: i}
resp.IsEphemeral()
optMap := utils.GenerateOptionMap(i)
- v, ok := optMap["copaing"]
+ v, ok := optMap["user"]
if !ok {
- if err := resp.Message("Le copaing n'a pas été renseigné.").Send(); err != nil {
+ if err := resp.Message("Le user n'a pas été renseigné.").Send(); err != nil {
utils.SendAlert("commands/reset.go - Copaing not set", err.Error())
}
return
@@ -34,8 +34,15 @@ func ResetUser(s *discordgo.Session, i *discordgo.InteractionCreate) {
}
return
}
- xp.GetCopaing(m.ID, i.GuildID).Reset()
- if err := resp.Message("Le copaing bien été reset.").Send(); err != nil {
- utils.SendAlert("commands/reset.go - Sending success (copaing)", err.Error())
+ 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()
+ if err != nil {
+ utils.SendAlert("commands/reset.go - Error deleting", err.Error())
+ }
+ }
+ if err = resp.Message("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 8320fe9..a43e055 100644
--- a/commands/top.go
+++ b/commands/top.go
@@ -2,14 +2,14 @@ package commands
import (
"fmt"
- "github.com/anhgelus/gokord"
"github.com/anhgelus/gokord/utils"
- "github.com/anhgelus/les-copaings-bot/xp"
+ "github.com/anhgelus/les-copaings-bot/exp"
+ "github.com/anhgelus/les-copaings-bot/user"
"github.com/bwmarrin/discordgo"
+ "sync"
)
func Top(s *discordgo.Session, i *discordgo.InteractionCreate) {
- xp.LastEventUpdate(s, xp.GetCopaing(i.Member.User.ID, i.GuildID))
resp := utils.ResponseBuilder{C: s, I: i}
err := resp.IsDeferred().Send()
if err != nil {
@@ -17,26 +17,48 @@ func Top(s *discordgo.Session, i *discordgo.InteractionCreate) {
return
}
resp.NotDeferred().IsEdit()
- go func() {
- var tops []xp.Copaing
- gokord.DB.Where("guild_id = ?", i.GuildID).Limit(10).Order("xp desc").Find(&tops)
- msg := ""
- for i, c := range tops {
- if i == 9 {
- msg += fmt.Sprintf("%d. **<@%s>** - niveau %d", i+1, c.DiscordID, xp.Level(c.XP))
- } else {
- msg += fmt.Sprintf("%d. **<@%s>** - niveau %d\n", i+1, c.DiscordID, xp.Level(c.XP))
+ embeds := make([]*discordgo.MessageEmbed, 3)
+ wg := sync.WaitGroup{}
+
+ fn := func(s string, n uint, d int, id int) {
+ defer wg.Done()
+ tops, err := user.GetBestXP(i.GuildID, n, d)
+ if err != nil {
+ utils.SendAlert("commands/top.go - Fetching best xp", err.Error(), "n", n, "d", d, "id", id, "guild_id", i.GuildID)
+ embeds[id] = &discordgo.MessageEmbed{
+ Title: s,
+ Description: "Erreur : impossible de récupérer la liste",
+ Color: utils.Error,
}
+ return
}
- err = resp.Embeds([]*discordgo.MessageEmbed{
- {
- Title: "Top",
- Description: msg,
- Color: utils.Success,
- },
- }).Send()
+ embeds[id] = &discordgo.MessageEmbed{
+ Title: s,
+ Description: genTopsMessage(tops),
+ Color: utils.Success,
+ }
+ }
+
+ wg.Add(3)
+ go fn("Top full time", 10, -1, 0)
+ go fn("Top 30 jours", 5, 30, 1)
+ go fn("Top 7 jours", 5, 7, 2)
+ go func() {
+ wg.Wait()
+ err = resp.Embeds(embeds).Send()
if err != nil {
utils.SendAlert("commands/top.go - Sending response top", err.Error())
}
}()
}
+
+func genTopsMessage(tops []user.CopaingAccess) string {
+ msg := ""
+ for i, c := range tops {
+ msg += fmt.Sprintf("%d. **<@%s>** - niveau %d", i+1, c.ToCopaing().DiscordID, exp.Level(c.GetXP()))
+ if i != len(tops)-1 {
+ msg += "\n"
+ }
+ }
+ return msg
+}
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-03 17:06:07 +0000