feat(top): implements new kind of tops

This commit is contained in:
Anhgelus Morhtuuzh 2025-05-13 16:15:47 +02:00
parent 799df74fcd
commit 01bafe9bf1
Signed by: anhgelus
GPG key ID: CAD341EFA92DDDE5
7 changed files with 179 additions and 58 deletions

View file

@ -11,7 +11,6 @@ import (
func Rank(s *discordgo.Session, i *discordgo.InteractionCreate) {
optMap := utils.GenerateOptionMap(i)
c := user.GetCopaing(i.Member.User.ID, i.GuildID) // current user = member who used /rank
user.LastEventUpdate(s, c) // update exp and reset last event
msg := "Votre niveau"
m := i.Member
var err error
@ -21,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,
@ -36,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 = user.GetCopaing(u.ID, i.GuildID) // current user = member targeted by member who wrote /rank
user.UpdateXP(s, c) // update exp without resetting event
msg = fmt.Sprintf("Le niveau de %s", m.DisplayName())
}
lvl := exp.Level(c.XP)
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())
}
}

View file

@ -34,8 +34,15 @@ func ResetUser(s *discordgo.Session, i *discordgo.InteractionCreate) {
}
return
}
user.GetCopaing(m.ID, i.GuildID).Reset()
if err := resp.Message("Le user bien été reset.").Send(); err != nil {
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())
}
}

View file

@ -2,15 +2,14 @@ package commands
import (
"fmt"
"github.com/anhgelus/gokord"
"github.com/anhgelus/gokord/utils"
"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) {
user.LastEventUpdate(s, user.GetCopaing(i.Member.User.ID, i.GuildID))
resp := utils.ResponseBuilder{C: s, I: i}
err := resp.IsDeferred().Send()
if err != nil {
@ -18,26 +17,48 @@ func Top(s *discordgo.Session, i *discordgo.InteractionCreate) {
return
}
resp.NotDeferred().IsEdit()
go func() {
var tops []user.Copaing
gokord.DB.Where("guild_id = ?", i.GuildID).Limit(10).Order("exp desc").Find(&tops)
msg := ""
for i, c := range tops {
if i == 9 {
msg += fmt.Sprintf("%d. **<@%s>** - niveau %d", i+1, c.DiscordID, exp.Level(c.XP))
} else {
msg += fmt.Sprintf("%d. **<@%s>** - niveau %d\n", i+1, c.DiscordID, exp.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
}