anhgelus/les-copaings-bot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(xp): implements xp reducer

Browse source
This commit is contained in:
Anhgelus Morhtuuzh 2024-04-15 19:06:33 +02:00
parent 9de1f3f90b
commit 0a6ecf6af7
No known key found for this signature in database
GPG key ID: CF4550297832A29F
4 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
commands/rank.go
View file

@ -9,7 +9,8 @@ import (
func Rank(s *discordgo.Session, i *discordgo.InteractionCreate) { func Rank(s *discordgo.Session, i *discordgo.InteractionCreate) {
optMap := utils.GenerateOptionMap(i) 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" msg := "Votre niveau"
m := i.Member m := i.Member
var err error var err error
@ -24,17 +25,25 @@ func Rank(s *discordgo.Session, i *discordgo.InteractionCreate) {
} }
m, err = s.GuildMember(i.GuildID, u.ID) m, err = s.GuildMember(i.GuildID, u.ID)
if err != nil { 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() err = resp.Message("Erreur : impossible de récupérer le membre").IsEphemeral().Send()
if err != nil { if err != nil {
utils.SendAlert("rank.go - Reply error fetching guild member", err.Error()) utils.SendAlert("rank.go - Reply error fetching guild member", err.Error())
} }
return 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()) msg = fmt.Sprintf("Le niveau de %s", m.DisplayName())
} }
c.Load()
lvl := xp.Level(c.XP) lvl := xp.Level(c.XP)
nxtLvl := xp.XPForLevel(lvl + 1) nxtLvl := xp.XPForLevel(lvl + 1)
err = resp.Message(fmt.Sprintf( err = resp.Message(fmt.Sprintf(

1
commands/top.go
View file

@ -9,6 +9,7 @@ import (
) )
func Top(s *discordgo.Session, i *discordgo.InteractionCreate) { func Top(s *discordgo.Session, i *discordgo.InteractionCreate) {
xp.LastEventUpdate(xp.GetCopaing(i.User.ID, i.GuildID))
resp := utils.ResponseBuilder{C: s, I: i} resp := utils.ResponseBuilder{C: s, I: i}
err := resp.IsDeferred().Send() err := resp.IsDeferred().Send()
if err != nil { if err != nil {

4
xp/events.go
View file

@ -30,7 +30,7 @@ func OnMessage(s *discordgo.Session, m *discordgo.MessageCreate) {
return return
} }
c := GetCopaing(m.Author.ID, m.GuildID) c := GetCopaing(m.Author.ID, m.GuildID)
onLastEventUpdate(c) LastEventUpdate(c)
// add xp // add xp
trimmed := utils.TrimMessage(strings.ToLower(m.Content)) trimmed := utils.TrimMessage(strings.ToLower(m.Content))
m.Member.User = m.Author m.Member.User = m.Author
@ -63,7 +63,7 @@ func OnVoiceUpdate(s *discordgo.Session, e *discordgo.VoiceStateUpdate) {
if e.Member.User.Bot { if e.Member.User.Bot {
return return
} }
onLastEventUpdate(GetCopaing(e.UserID, e.GuildID)) LastEventUpdate(GetCopaing(e.UserID, e.GuildID))
cfg := config.GetGuildConfig(e.GuildID) cfg := config.GetGuildConfig(e.GuildID)
if cfg.IsDisabled(e.ChannelID) { if cfg.IsDisabled(e.ChannelID) {
return return

4
xp/level.go
View file

@ -43,7 +43,7 @@ func onNewLevel(s *discordgo.Session, m *discordgo.Member, level uint) {
} }
} }
func onLastEventUpdate(c *Copaing) { func LastEventUpdate(c *Copaing) {
h := c.HourSinceLastEvent() h := c.HourSinceLastEvent()
l := Lose(h, c.XP) l := Lose(h, c.XP)
xp := c.XPAlreadyRemoved() xp := c.XPAlreadyRemoved()
@ -57,7 +57,7 @@ func onLastEventUpdate(c *Copaing) {
c.SetLastEvent() c.SetLastEvent()
} }
func onXPUpdate(c *Copaing) { func XPUpdate(c *Copaing) {
h := c.HourSinceLastEvent() h := c.HourSinceLastEvent()
l := Lose(h, c.XP) l := Lose(h, c.XP)
xp := c.XPAlreadyRemoved() xp := c.XPAlreadyRemoved()