aboutsummaryrefslogtreecommitdiff
path: root/commands
diff options
context:
space:
mode:
authorWilliam Hergès <william@herges.fr>2025-09-13 13:32:01 +0200
committerWilliam Hergès <william@herges.fr>2025-09-13 13:32:01 +0200
commit8885566932c965926ee64fad6404e6f26bc13220 (patch)
treeb71b00b454a35791dab9943ced96b8d804574bf7 /commands
parenta7d95c1248631058754445e8b487bd6b17c003e2 (diff)
build(gokord): upgrade to latest version
Diffstat (limited to 'commands')
-rw-r--r--commands/config.go36
-rw-r--r--commands/rank.go4
-rw-r--r--commands/reset.go2
-rw-r--r--commands/stats.go9
-rw-r--r--commands/top.go7
5 files changed, 13 insertions, 45 deletions
diff --git a/commands/config.go b/commands/config.go
index c4644bc..838f7e9 100644
--- a/commands/config.go
+++ b/commands/config.go
@@ -7,7 +7,6 @@ import (
"git.anhgelus.world/anhgelus/les-copaings-bot/config"
"git.anhgelus.world/anhgelus/les-copaings-bot/exp"
"github.com/anhgelus/gokord/cmd"
- "github.com/anhgelus/gokord/component"
"github.com/anhgelus/gokord/logger"
discordgo "github.com/nyttikord/gokord"
)
@@ -50,14 +49,6 @@ func Config(_ *discordgo.Session, i *discordgo.InteractionCreate, _ cmd.OptionMa
defaultChan = fmt.Sprintf("<#%s>", cfg.FallbackChannel)
}
//comp := component.New().
- // Add(component.NewTextDisplay("# Config")).
- // Add(component.NewTextDisplay("**Salon par défaut**\n" + defaultChan)).
- // Add(component.NewSeparator()).
- // Add(component.NewTextDisplay("**Rôles liés aux niveaux**\n" + roles)).
- // Add(component.NewSeparator()).
- // Add(component.NewTextDisplay("**Salons désactivés**\n" + chans)).
- // Add(component.NewSeparator()).
- // Add(component.NewTextDisplay(fmt.Sprintf("**%s**\n%d", "Jours avant la réduction", cfg.DaysXPRemains))).
// Add(component.NewActionRow().Add(component.NewStringSelect(ConfigModify).
// SetPlaceholder("Modifier...").
// AddOption(
@@ -82,31 +73,6 @@ func Config(_ *discordgo.Session, i *discordgo.InteractionCreate, _ cmd.OptionMa
// SetEmoji(&discordgo.ComponentEmoji{Name: "⌛"}),
// ),
// ))
- comp := component.New().
- Add(component.NewActionRow().Add(component.NewStringSelect(ConfigModify).
- SetPlaceholder("Modifier...").
- AddOption(
- component.NewSelectOption("Rôles liés à l'XP", config.ModifyXpRole).
- SetDescription("Gère les rôles liés à l'XP").
- SetEmoji(&discordgo.ComponentEmoji{Name: "🏅"}),
- ).
- AddOption(
- component.NewSelectOption("Salons désactivés", config.ModifyDisChannel).
- SetDescription("Gère les salons désactivés").
- SetEmoji(&discordgo.ComponentEmoji{Name: "❌"}),
- ).
- AddOption(
- // I don't have a better idea for this...
- component.NewSelectOption("Salons par défaut", config.ModifyFallbackChannel).
- SetDescription("Spécifie le salon par défaut").
- SetEmoji(&discordgo.ComponentEmoji{Name: "💾"}),
- ).
- AddOption(
- component.NewSelectOption("Temps avec la réduction", config.ModifyTimeReduce).
- SetDescription("Gère le temps avant la réduction d'XP").
- SetEmoji(&discordgo.ComponentEmoji{Name: "⌛"}),
- ),
- ))
msg := fmt.Sprintf(
"# Config\n**Salon par défaut**\n%s\n\n**Rôles liés aux niveaux**\n%s\n\n**Salons désactivés**\n%s\n\n**Jours avant la réduction**\n%d",
defaultChan,
@@ -114,7 +80,7 @@ func Config(_ *discordgo.Session, i *discordgo.InteractionCreate, _ cmd.OptionMa
chans,
cfg.DaysXPRemains,
)
- err := resp.SetComponents(comp).SetMessage(msg).IsEphemeral().Send()
+ err := resp.SetMessage(msg).IsEphemeral().Send()
if err != nil {
logger.Alert("config/guild.go - Sending config", err.Error())
}
diff --git a/commands/rank.go b/commands/rank.go
index 94dabf2..0adfde6 100644
--- a/commands/rank.go
+++ b/commands/rank.go
@@ -16,14 +16,14 @@ func Rank(s *discordgo.Session, i *discordgo.InteractionCreate, optMap cmd.Optio
m := i.Member
var err error
if v, ok := optMap["copaing"]; ok {
- u := v.UserValue(s)
+ 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 {
logger.Alert("commands/rank.go - Reply error user is a bot", err.Error())
}
}
- m, err = s.GuildMember(i.GuildID, u.ID)
+ m, err = s.GuildAPI().Member(i.GuildID, u.ID)
if err != nil {
logger.Alert(
"commands/rank.go - Fetching guild member",
diff --git a/commands/reset.go b/commands/reset.go
index 07e3ba3..f50bb21 100644
--- a/commands/reset.go
+++ b/commands/reset.go
@@ -25,7 +25,7 @@ func ResetUser(s *discordgo.Session, i *discordgo.InteractionCreate, optMap cmd.
}
return
}
- m := v.UserValue(s)
+ m := v.UserValue(s.UserAPI())
if m.Bot {
if err := resp.SetMessage("Les bots n'ont pas de niveau :upside_down:").Send(); err != nil {
logger.Alert("commands/reset.go - Copaing not set", err.Error())
diff --git a/commands/stats.go b/commands/stats.go
index 15fb556..1a7a379 100644
--- a/commands/stats.go
+++ b/commands/stats.go
@@ -18,6 +18,7 @@ import (
"github.com/anhgelus/gokord/logger"
"github.com/jackc/pgx/v5/pgtype"
discordgo "github.com/nyttikord/gokord"
+ "github.com/nyttikord/gokord/channel"
"gonum.org/v1/plot"
"gonum.org/v1/plot/plotter"
"gonum.org/v1/plot/vg"
@@ -66,7 +67,7 @@ func Stats(s *discordgo.Session, i *discordgo.InteractionCreate, opt cmd.OptionM
go func() {
var w io.WriterTo
if v, ok := opt["user"]; ok {
- w, err = statsMember(s, i, days, v.UserValue(s).ID)
+ w, err = statsMember(s, i, days, v.UserValue(s.UserAPI()).ID)
} else {
w, err = statsAll(s, i, days)
}
@@ -81,7 +82,7 @@ func Stats(s *discordgo.Session, i *discordgo.InteractionCreate, opt cmd.OptionM
if err != nil {
logger.Alert("commands/stats.go - Writing png", err.Error())
}
- err = resp.AddFile(&discordgo.File{
+ err = resp.AddFile(&channel.File{
Name: "plot.png",
ContentType: "image/png",
Reader: b,
@@ -99,7 +100,7 @@ func statsAll(s *discordgo.Session, i *discordgo.InteractionCreate, days int) (i
}
func statsMember(s *discordgo.Session, i *discordgo.InteractionCreate, days int, discordID string) (io.WriterTo, error) {
- _, err := s.GuildMember(i.GuildID, discordID)
+ _, err := s.GuildAPI().Member(i.GuildID, discordID)
if err != nil {
return nil, err
}
@@ -199,7 +200,7 @@ func generatePlot(s *discordgo.Session, i *discordgo.InteractionCreate, copaings
cnt := 0
for in, c := range copaings {
- m, err := s.GuildMember(i.GuildID, c.DiscordID)
+ m, err := s.GuildAPI().Member(i.GuildID, c.DiscordID)
if err != nil {
logger.Alert("commands/stats.go - Fetching guild member", err.Error())
return nil, err
diff --git a/commands/top.go b/commands/top.go
index ecbf6f4..21a1456 100644
--- a/commands/top.go
+++ b/commands/top.go
@@ -10,6 +10,7 @@ import (
"github.com/anhgelus/gokord/cmd"
"github.com/anhgelus/gokord/logger"
discordgo "github.com/nyttikord/gokord"
+ "github.com/nyttikord/gokord/channel"
)
func Top(_ *discordgo.Session, i *discordgo.InteractionCreate, _ cmd.OptionMap, resp *cmd.ResponseBuilder) {
@@ -18,7 +19,7 @@ func Top(_ *discordgo.Session, i *discordgo.InteractionCreate, _ cmd.OptionMap,
logger.Alert("commands/top.go - Sending deferred", err.Error())
return
}
- embeds := make([]*discordgo.MessageEmbed, 3)
+ embeds := make([]*channel.MessageEmbed, 3)
wg := sync.WaitGroup{}
fn := func(s string, n uint, d int, id int) {
@@ -26,14 +27,14 @@ func Top(_ *discordgo.Session, i *discordgo.InteractionCreate, _ cmd.OptionMap,
tops, err := user.GetBestXP(i.GuildID, n, d)
if err != nil {
logger.Alert("commands/top.go - Fetching best xp", err.Error(), "n", n, "d", d, "id", id, "guild_id", i.GuildID)
- embeds[id] = &discordgo.MessageEmbed{
+ embeds[id] = &channel.MessageEmbed{
Title: s,
Description: "Erreur : impossible de récupérer la liste",
Color: 0x831010,
}
return
}
- embeds[id] = &discordgo.MessageEmbed{
+ embeds[id] = &channel.MessageEmbed{
Title: s,
Description: genTopsMessage(tops),
Color: 0x10E6AD,