From 0a6ecf6af7dc8df0a2255ddb7c022cfad6452493 Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Mon, 15 Apr 2024 19:06:33 +0200 Subject: feat(xp): implements xp reducer --- commands/rank.go | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'commands/rank.go') diff --git a/commands/rank.go b/commands/rank.go index cd37a0c..ecf9a08 100644 --- a/commands/rank.go +++ b/commands/rank.go @@ -9,7 +9,8 @@ import ( func Rank(s *discordgo.Session, i *discordgo.InteractionCreate) { optMap := utils.GenerateOptionMap(i) - c := xp.Copaing{DiscordID: i.Member.User.ID, GuildID: i.GuildID} + c := xp.GetCopaing(i.User.ID, i.GuildID) // current copaing = member who used /rank + xp.LastEventUpdate(c) // update xp and reset last event msg := "Votre niveau" m := i.Member var err error @@ -24,17 +25,25 @@ func Rank(s *discordgo.Session, i *discordgo.InteractionCreate) { } m, err = s.GuildMember(i.GuildID, u.ID) if err != nil { - utils.SendAlert("rank.go - Fetching guild member", err.Error()) + utils.SendAlert( + "rank.go - Fetching guild member", + err.Error(), + "discord_id", + u.ID, + "guild_id", + i.GuildID, + ) 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()) } return } - c.DiscordID = u.ID + c.DiscordID = u.ID // current copaing = member targeted by member who wrote /rank + c.Load() // reload copaing (change line before) + xp.XPUpdate(c) // update xp without resetting event msg = fmt.Sprintf("Le niveau de %s", m.DisplayName()) } - c.Load() lvl := xp.Level(c.XP) nxtLvl := xp.XPForLevel(lvl + 1) err = resp.Message(fmt.Sprintf( -- cgit v1.2.3 From e78c8d8c422bf470924109c186cff9f987b095fd Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Mon, 15 Apr 2024 19:30:02 +0200 Subject: fix(command): /rank prochain niveau not working --- commands/rank.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'commands/rank.go') diff --git a/commands/rank.go b/commands/rank.go index ecf9a08..fe05ba8 100644 --- a/commands/rank.go +++ b/commands/rank.go @@ -9,8 +9,8 @@ import ( func Rank(s *discordgo.Session, i *discordgo.InteractionCreate) { optMap := utils.GenerateOptionMap(i) - c := xp.GetCopaing(i.User.ID, i.GuildID) // current copaing = member who used /rank - xp.LastEventUpdate(c) // update xp and reset last event + c := xp.GetCopaing(i.Member.User.ID, i.GuildID) // current copaing = member who used /rank + xp.LastEventUpdate(c) // update xp and reset last event msg := "Votre niveau" m := i.Member var err error @@ -45,13 +45,13 @@ func Rank(s *discordgo.Session, i *discordgo.InteractionCreate) { msg = fmt.Sprintf("Le niveau de %s", m.DisplayName()) } lvl := xp.Level(c.XP) - nxtLvl := xp.XPForLevel(lvl + 1) + nxtLvlXP := xp.XPForLevel(lvl + 1) err = resp.Message(fmt.Sprintf( "%s : **%d**\n> XP : %d\n> Prochain niveau dans %d XP", msg, lvl, c.XP, - nxtLvl-lvl, + nxtLvlXP-xp.XPForLevel(lvl), )).Send() if err != nil { utils.SendAlert("rank.go - Sending rank", err.Error()) -- cgit v1.2.3 From d673c055d26b9e3e56d136864946c7dbcd271426 Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Mon, 15 Apr 2024 19:46:25 +0200 Subject: fix(command): (again) bad xp shown for /rank in prochain niveau --- 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 fe05ba8..d056de1 100644 --- a/commands/rank.go +++ b/commands/rank.go @@ -51,7 +51,7 @@ func Rank(s *discordgo.Session, i *discordgo.InteractionCreate) { msg, lvl, c.XP, - nxtLvlXP-xp.XPForLevel(lvl), + nxtLvlXP-c.XP, )).Send() if err != nil { utils.SendAlert("rank.go - Sending rank", err.Error()) -- cgit v1.2.3 From ef39c156f94b854796bb1c2adddfd40a5acaeca8 Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Tue, 16 Apr 2024 15:23:15 +0200 Subject: feat(reducer): role update on new level --- commands/rank.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'commands/rank.go') diff --git a/commands/rank.go b/commands/rank.go index d056de1..219977d 100644 --- a/commands/rank.go +++ b/commands/rank.go @@ -10,7 +10,7 @@ import ( 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(c) // update xp and reset last event + xp.LastEventUpdate(s, c) // update xp and reset last event msg := "Votre niveau" m := i.Member var err error @@ -41,7 +41,7 @@ func Rank(s *discordgo.Session, i *discordgo.InteractionCreate) { } c.DiscordID = u.ID // current copaing = member targeted by member who wrote /rank c.Load() // reload copaing (change line before) - xp.XPUpdate(c) // update xp without resetting event + xp.XPUpdate(s, c) // update xp without resetting event msg = fmt.Sprintf("Le niveau de %s", m.DisplayName()) } lvl := xp.Level(c.XP) -- cgit v1.2.3