diff options
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/rank.go | 72 | ||||
| -rw-r--r-- | commands/reset.go | 49 | ||||
| -rw-r--r-- | commands/stats.go | 97 | ||||
| -rw-r--r-- | commands/top.go | 88 |
4 files changed, 152 insertions, 154 deletions
diff --git a/commands/rank.go b/commands/rank.go index 4080864..3a017f6 100644 --- a/commands/rank.go +++ b/commands/rank.go @@ -1,6 +1,7 @@ package commands import ( + "context" "fmt" "git.anhgelus.world/anhgelus/les-copaings-bot/exp" @@ -10,51 +11,42 @@ import ( "github.com/nyttikord/gokord/event" ) -func Rank(s bot.Session, i *event.InteractionCreate, optMap cmd.OptionMap, resp *cmd.ResponseBuilder) { - c := user.GetCopaing(i.Member.User.ID, i.GuildID) // current user = member who used /rank - msg := "Votre niveau" - m := i.Member - var err error - if v, ok := optMap["copaing"]; ok { - u := v.UserValue(s.UserAPI()) - if u.Bot { - err = resp.SetMessage("Imagine si les bots avaient un niveau :rolling_eyes:").IsEphemeral().Send() - if err != nil { - s.Logger().Error("reply error user is a bot", "error", err) +func Rank(ctx context.Context) func(s bot.Session, i *event.InteractionCreate, optMap cmd.OptionMap, resp *cmd.ResponseBuilder) { + return func(s bot.Session, i *event.InteractionCreate, optMap cmd.OptionMap, resp *cmd.ResponseBuilder) { + c := user.GetCopaing(ctx, i.Member.User.ID, i.GuildID) // current user = member who used /rank + msg := "Votre niveau" + m := i.Member + var err error + if v, ok := optMap["copaing"]; ok { + u := v.UserValue(s.UserAPI()) + if u.Bot { + err = resp.SetMessage("Imagine si les bots avaient un niveau :rolling_eyes:").IsEphemeral().Send() + if err != nil { + s.Logger().Error("reply error user is a bot", "error", err) + } + return } - return - } - m, err = s.GuildAPI().Member(i.GuildID, u.ID) - if err != nil { - s.Logger().Error("fetching guild member", "error", err, "user", u.Username, "guild", i.GuildID) - err = resp.SetMessage("Erreur : impossible de récupérer le membre").IsEphemeral().Send() + m, err = s.GuildAPI().Member(i.GuildID, u.ID) if err != nil { - s.Logger().Error("reply error fetching guild member", "error", err) + s.Logger().Error("fetching guild member", "error", err, "user", u.Username, "guild", i.GuildID) + err = resp.SetMessage("Erreur : impossible de récupérer le membre").IsEphemeral().Send() + if err != nil { + s.Logger().Error("reply error fetching guild member", "error", err) + } + return } - return + c = user.GetCopaing(ctx, u.ID, i.GuildID) // current user = member targeted by member who wrote /rank + msg = fmt.Sprintf("Le niveau de %s", m.DisplayName()) } - 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()) - } - xp, err := c.GetXP(s.Logger()) - if err != nil { - s.Logger().Error("fetching xp", "error", err, "copaing", c.ID, "guild", i.GuildID) - err = resp.SetMessage("Erreur : impossible de récupérer l'XP").IsEphemeral().Send() + xp := c.XP + lvl := exp.Level(xp) + nxtLvlXP := exp.LevelXP(lvl + 1) + err = resp.SetMessage(fmt.Sprintf( + "%s : **%d**\n> XP : %d\n> Prochain niveau dans %d XP", + msg, lvl, xp, nxtLvlXP-xp, + )).Send() if err != nil { - s.Logger().Error("reply error fetching xp", "error", err) + s.Logger().Error("sending rank", "error", err) } - return - } - lvl := exp.Level(xp) - nxtLvlXP := exp.LevelXP(lvl + 1) - err = resp.SetMessage(fmt.Sprintf( - "%s : **%d**\n> XP : %d\n> Prochain niveau dans %d XP", - msg, - lvl, - xp, - nxtLvlXP-xp, - )).Send() - if err != nil { - s.Logger().Error("sending rank", "error", err) } } diff --git a/commands/reset.go b/commands/reset.go index 21bfeb7..ae31781 100644 --- a/commands/reset.go +++ b/commands/reset.go @@ -1,6 +1,8 @@ package commands import ( + "context" + "git.anhgelus.world/anhgelus/les-copaings-bot/user" "github.com/anhgelus/gokord" "github.com/anhgelus/gokord/cmd" @@ -10,37 +12,40 @@ import ( func Reset(s bot.Session, i *event.InteractionCreate, _ cmd.OptionMap, resp *cmd.ResponseBuilder) { var copaings []*user.Copaing + //TODO: delete everything from cache gokord.DB.Where("guild_id = ?", i.GuildID).Delete(&copaings) if err := resp.IsEphemeral().SetMessage("L'XP a été reset.").Send(); err != nil { s.Logger().Error("sending reset success", "error", err) } } -func ResetUser(s bot.Session, i *event.InteractionCreate, optMap cmd.OptionMap, resp *cmd.ResponseBuilder) { - resp.IsEphemeral() - v, ok := optMap["user"] - if !ok { - if err := resp.SetMessage("Le user n'a pas été renseigné.").Send(); err != nil { - s.Logger().Error("sending error copaing not set", "error", err) +func ResetUser(ctx context.Context) func(s bot.Session, i *event.InteractionCreate, optMap cmd.OptionMap, resp *cmd.ResponseBuilder) { + return func(s bot.Session, i *event.InteractionCreate, optMap cmd.OptionMap, resp *cmd.ResponseBuilder) { + resp.IsEphemeral() + v, ok := optMap["user"] + if !ok { + if err := resp.SetMessage("Le user n'a pas été renseigné.").Send(); err != nil { + s.Logger().Error("sending error copaing not set", "error", err) + } + return } - return - } - m := v.UserValue(s.UserAPI()) - if m.Bot { - if err := resp.SetMessage("Les bots n'ont pas de niveau :upside_down:").Send(); err != nil { - s.Logger().Error("sending error bot does not have xp", "error", err) + m := v.UserValue(s.UserAPI()) + if m.Bot { + if err := resp.SetMessage("Les bots n'ont pas de niveau :upside_down:").Send(); err != nil { + s.Logger().Error("sending error bot does not have xp", "error", err) + } + return } - return - } - err := user.GetCopaing(m.ID, i.GuildID).Delete() - if err != nil { - s.Logger().Error("deleting copaing", "error", err, "user", m.Username, "guild", i.GuildID) - err = resp.SetMessage("Erreur : impossible de reset l'utilisateur").Send() + err := user.GetCopaing(ctx, m.ID, i.GuildID).Delete(ctx) if err != nil { - s.Logger().Error("sending error while deleting", "error", err) + s.Logger().Error("deleting copaing", "error", err, "user", m.Username, "guild", i.GuildID) + err = resp.SetMessage("Erreur : impossible de reset l'utilisateur").Send() + if err != nil { + s.Logger().Error("sending error while deleting", "error", err) + } + } + if err = resp.SetMessage("Le user bien été reset.").Send(); err != nil { + s.Logger().Error("sending reset success", "error", err) } - } - if err = resp.SetMessage("Le user bien été reset.").Send(); err != nil { - s.Logger().Error("sending reset success", "error", err) } } diff --git a/commands/stats.go b/commands/stats.go index 4fc35ae..716616d 100644 --- a/commands/stats.go +++ b/commands/stats.go @@ -2,6 +2,7 @@ package commands import ( "bytes" + "context" "errors" "fmt" "image/color" @@ -46,56 +47,58 @@ var colors = []color.RGBA{ {193, 18, 31, 255}, } -func Stats(s bot.Session, i *event.InteractionCreate, opt cmd.OptionMap, resp *cmd.ResponseBuilder) { - cfg := config.GetGuildConfig(i.GuildID) - days := 15 - if gokord.Debug { - days = 90 - } - if v, ok := opt["days"]; ok { - in := v.IntValue() - if in < 1 || uint(in) > cfg.DaysXPRemains { - msg := fmt.Sprintf("Nombre de jours invalide. Il doit être strictement positif et inférieur à %d", cfg.DaysXPRemains) - if err := resp.SetMessage(msg).IsEphemeral().Send(); err != nil { - s.Logger().Error("sending error invalid days", "error", err) - } - return +func Stats(ctx context.Context) func(s bot.Session, i *event.InteractionCreate, opt cmd.OptionMap, resp *cmd.ResponseBuilder) { + return func(s bot.Session, i *event.InteractionCreate, opt cmd.OptionMap, resp *cmd.ResponseBuilder) { + cfg := config.GetGuildConfig(i.GuildID) + days := 15 + if gokord.Debug { + days = 90 } - days = int(in) - } - err := resp.IsDeferred().Send() - if err != nil { - s.Logger().Error("sending deferred", "error", err) - return - } - go func() { - var w io.WriterTo - if v, ok := opt["user"]; ok { - w, err = statsMember(s, i, days, v.UserValue(s.UserAPI()).ID) - } else { - w, err = statsAll(s, i, days) - } - if err != nil { - s.Logger().Error("generating stats", "error", err, "guild", i.GuildID) - if err = resp.IsEphemeral().SetMessage("Il y a eu une erreur...").Send(); err != nil { - s.Logger().Error("sending error occurred", "error", err) + if v, ok := opt["days"]; ok { + in := v.IntValue() + if in < 1 || uint(in) > cfg.DaysXPRemains { + msg := fmt.Sprintf("Nombre de jours invalide. Il doit être strictement positif et inférieur à %d", cfg.DaysXPRemains) + if err := resp.SetMessage(msg).IsEphemeral().Send(); err != nil { + s.Logger().Error("sending error invalid days", "error", err) + } + return } - return - } - b := new(bytes.Buffer) - _, err = w.WriteTo(b) - if err != nil { - s.Logger().Error("writing png", "error", err) + days = int(in) } - err = resp.AddFile(&channel.File{ - Name: "plot.png", - ContentType: "image/png", - Reader: b, - }).Send() + err := resp.IsDeferred().Send() if err != nil { - s.Logger().Error("sending stats", "error", err) + s.Logger().Error("sending deferred", "error", err) + return } - }() + go func() { + var w io.WriterTo + if v, ok := opt["user"]; ok { + w, err = statsMember(ctx, s, i, days, v.UserValue(s.UserAPI()).ID) + } else { + w, err = statsAll(s, i, days) + } + if err != nil { + s.Logger().Error("generating stats", "error", err, "guild", i.GuildID) + if err = resp.IsEphemeral().SetMessage("Il y a eu une erreur...").Send(); err != nil { + s.Logger().Error("sending error occurred", "error", err) + } + return + } + b := new(bytes.Buffer) + _, err = w.WriteTo(b) + if err != nil { + s.Logger().Error("writing png", "error", err) + } + err = resp.AddFile(&channel.File{ + Name: "plot.png", + ContentType: "image/png", + Reader: b, + }).Send() + if err != nil { + s.Logger().Error("sending stats", "error", err) + } + }() + } } func statsAll(s bot.Session, i *event.InteractionCreate, days int) (io.WriterTo, error) { @@ -104,7 +107,7 @@ func statsAll(s bot.Session, i *event.InteractionCreate, days int) (io.WriterTo, }) } -func statsMember(s bot.Session, i *event.InteractionCreate, days int, discordID string) (io.WriterTo, error) { +func statsMember(ctx context.Context, s bot.Session, i *event.InteractionCreate, days int, discordID string) (io.WriterTo, error) { _, err := s.GuildAPI().Member(i.GuildID, discordID) if err != nil { return nil, err @@ -112,7 +115,7 @@ func statsMember(s bot.Session, i *event.InteractionCreate, days int, discordID return stats(s, i, days, func(before, after string) *gorm.DB { return gokord.DB.Raw( before+"WHERE guild_id = ? and created_at > ? and copaing_id = ?"+after, - i.GuildID, exp.TimeStampNDaysBefore(uint(days)), user.GetCopaing(discordID, i.GuildID).ID, + i.GuildID, exp.TimeStampNDaysBefore(uint(days)), user.GetCopaing(ctx, discordID, i.GuildID).ID, ) }) } diff --git a/commands/top.go b/commands/top.go index bb08144..99c8f16 100644 --- a/commands/top.go +++ b/commands/top.go @@ -1,6 +1,7 @@ package commands import ( + "context" "fmt" "sync" @@ -13,62 +14,59 @@ import ( "github.com/nyttikord/gokord/event" ) -func Top(s bot.Session, i *event.InteractionCreate, _ cmd.OptionMap, resp *cmd.ResponseBuilder) { - err := resp.IsDeferred().Send() - if err != nil { - s.Logger().Error("sending deferred", "error", err) - return - } - embeds := make([]*channel.MessageEmbed, 3) - wg := sync.WaitGroup{} +func Top(ctx context.Context) func(s bot.Session, i *event.InteractionCreate, _ cmd.OptionMap, resp *cmd.ResponseBuilder) { + return func(s bot.Session, i *event.InteractionCreate, _ cmd.OptionMap, resp *cmd.ResponseBuilder) { + embeds := make([]*channel.MessageEmbed, 3) + wg := sync.WaitGroup{} - fn := func(str string, n uint, d int, id int) { - defer wg.Done() - tops, err := user.GetBestXP(s.Logger(), i.GuildID, n, d) - if err != nil { - s.Logger().Error("fetching best xp", "error", err, "n", n, "d", d, "id", id, "guild", i.GuildID) + fn := func(str string, n uint, d int, id int) { + defer wg.Done() + tops, err := user.GetBestXP(ctx, i.GuildID, n, d) + if err != nil { + s.Logger().Error("fetching best xp", "error", err, "n", n, "d", d, "id", id, "guild", i.GuildID) + embeds[id] = &channel.MessageEmbed{ + Title: str, + Description: "Erreur : impossible de récupérer la liste", + Color: 0x831010, + } + return + } embeds[id] = &channel.MessageEmbed{ Title: str, - Description: "Erreur : impossible de récupérer la liste", - Color: 0x831010, + Description: genTopsMessage(tops), + Color: 0x10E6AD, } - return - } - embeds[id] = &channel.MessageEmbed{ - Title: str, - Description: genTopsMessage(tops), - Color: 0x10E6AD, } - } - cfg := config.GetGuildConfig(i.GuildID) - if cfg.DaysXPRemains > 30 { - wg.Add(1) - go fn(fmt.Sprintf("Top %d jours", cfg.DaysXPRemains), 10, -1, 0) - } - wg.Add(2) - go fn("Top 30 jours", 5, 30, 1) - go fn("Top 7 jours", 5, 7, 2) - go func() { - wg.Wait() + cfg := config.GetGuildConfig(i.GuildID) if cfg.DaysXPRemains > 30 { - resp.AddEmbed(embeds[0]). - AddEmbed(embeds[1]). - AddEmbed(embeds[2]) - } else { - resp.AddEmbed(embeds[1]). - AddEmbed(embeds[2]) + wg.Add(1) + go fn(fmt.Sprintf("Top %d jours", cfg.DaysXPRemains), 10, -1, 0) } - err = resp.Send() - if err != nil { - s.Logger().Error("sending response top", "error", err) - } - }() + wg.Add(2) + go fn("Top 30 jours", 5, 30, 1) + go fn("Top 7 jours", 5, 7, 2) + go func() { + wg.Wait() + if cfg.DaysXPRemains > 30 { + resp.AddEmbed(embeds[0]). + AddEmbed(embeds[1]). + AddEmbed(embeds[2]) + } else { + resp.AddEmbed(embeds[1]). + AddEmbed(embeds[2]) + } + err := resp.Send() + if err != nil { + s.Logger().Error("sending response top", "error", err) + } + }() + } } -func genTopsMessage(tops []user.CopaingAccess) string { +func genTopsMessage(tops []user.CopaingCached) string { msg := "" for i, c := range tops { - msg += fmt.Sprintf("%d. **<@%s>** - niveau %d", i+1, c.ToCopaing().DiscordID, exp.Level(c.GetXP())) + msg += fmt.Sprintf("%d. **<@%s>** - niveau %d", i+1, c.DiscordID, exp.Level(c.XP)) if i != len(tops)-1 { msg += "\n" } |