From c408afc8797b0da5e1d73d190a8f5884870b510c Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Tue, 13 May 2025 12:50:20 +0200 Subject: style(files): reorganize everything --- commands/rank.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'commands/rank.go') diff --git a/commands/rank.go b/commands/rank.go index 4d6f817..c659f2b 100644 --- a/commands/rank.go +++ b/commands/rank.go @@ -3,19 +3,20 @@ 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 + user.LastEventUpdate(s, c) // update exp and reset last event msg := "Votre niveau" m := i.Member var err error resp := utils.ResponseBuilder{C: s, I: i} - if v, ok := optMap["copaing"]; ok { + if v, ok := optMap["user"]; ok { u := v.UserValue(s) if u.Bot { err = resp.Message("Imagine si les bots avaient un niveau :rolling_eyes:").IsEphemeral().Send() @@ -39,12 +40,12 @@ func Rank(s *discordgo.Session, i *discordgo.InteractionCreate) { } 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 + user.UpdateXP(s, c) // update exp without resetting event msg = fmt.Sprintf("Le niveau de %s", m.DisplayName()) } - lvl := xp.Level(c.XP) - nxtLvlXP := xp.XPForLevel(lvl + 1) + lvl := exp.Level(c.XP) + nxtLvlXP := exp.LevelXP(lvl + 1) err = resp.Message(fmt.Sprintf( "%s : **%d**\n> XP : %d\n> Prochain niveau dans %d XP", msg, -- cgit v1.2.3 From 01bafe9bf1de5be4e770b9500480807d4973d8d6 Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Tue, 13 May 2025 16:15:47 +0200 Subject: feat(top): implements new kind of tops --- commands/rank.go | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) (limited to 'commands/rank.go') diff --git a/commands/rank.go b/commands/rank.go index c659f2b..785b8c8 100644 --- a/commands/rank.go +++ b/commands/rank.go @@ -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()) } } -- cgit v1.2.3 From 61c7bf4567249da0d13c2f738e56754a2c181c99 Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Tue, 13 May 2025 16:52:04 +0200 Subject: fix(db): wrong relation and bad where condition --- commands/rank.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'commands/rank.go') diff --git a/commands/rank.go b/commands/rank.go index 785b8c8..d079a84 100644 --- a/commands/rank.go +++ b/commands/rank.go @@ -45,7 +45,7 @@ func Rank(s *discordgo.Session, i *discordgo.InteractionCreate) { xp, err := c.GetXP() if err != nil { utils.SendAlert( - "commands/rank.go - Fetching XP", + "commands/rank.go - Fetching xp", err.Error(), "discord_id", c.ID, -- cgit v1.2.3 From a02a0d8e3e45d738c5a1a07dbc925c329ddf6278 Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Tue, 13 May 2025 18:24:27 +0200 Subject: fix(command): using wrong key for /rank due to previous automatic refactor --- commands/rank.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'commands/rank.go') diff --git a/commands/rank.go b/commands/rank.go index d079a84..70c0222 100644 --- a/commands/rank.go +++ b/commands/rank.go @@ -15,7 +15,7 @@ func Rank(s *discordgo.Session, i *discordgo.InteractionCreate) { m := i.Member var err error resp := utils.ResponseBuilder{C: s, I: i} - if v, ok := optMap["user"]; ok { + 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() -- cgit v1.2.3