aboutsummaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/guild.go3
-rw-r--r--config/xp_reduce.go6
-rw-r--r--config/xp_role.go20
3 files changed, 15 insertions, 14 deletions
diff --git a/config/guild.go b/config/guild.go
index 6cdc06b..98ef0cb 100644
--- a/config/guild.go
+++ b/config/guild.go
@@ -6,6 +6,7 @@ import (
"git.anhgelus.world/anhgelus/les-copaings-bot/common"
"github.com/nyttikord/gokord/bot"
+ "github.com/nyttikord/gokord/channel"
)
type Guild struct {
@@ -59,7 +60,7 @@ func (cfg *Guild) IsDisabled(ctx context.Context, dg bot.Session, channelID stri
c, err := dg.ChannelAPI().State.Channel(channelID)
if err != nil {
bot.Logger(ctx).Error("unable to find channel %s in state", "error", err, "channel", c)
- c, err = dg.ChannelAPI().Channel(channelID).Do(ctx)
+ c, err = channel.Get(channelID).Do(ctx)
if err != nil {
bot.Logger(ctx).Error("unable to fetch channel", "error", err, "channel", c)
return false
diff --git a/config/xp_reduce.go b/config/xp_reduce.go
index aa2c540..36e64ed 100644
--- a/config/xp_reduce.go
+++ b/config/xp_reduce.go
@@ -35,7 +35,7 @@ func HandleModifyPeriodicReduceCommand(ctx context.Context, dg bot.Session, i *i
},
}).
Response()
- err := dg.InteractionAPI().Respond(i.Interaction, resp).Do(ctx)
+ err := interaction.Respond(i.Interaction, resp).Do(ctx)
if err != nil {
bot.Logger(ctx).Error("sending xp reduce modal", "error", err)
}
@@ -49,7 +49,7 @@ func HandleTimeReduceSet(ctx context.Context, dg bot.Session, i *interaction.Mod
IsEphemeral().
Message(fmt.Sprintf("La valeur indiquée, `%s`, c'est pas un entier.", v)).
Response()
- err = dg.InteractionAPI().Respond(i.Interaction, resp).Do(ctx)
+ err = interaction.Respond(i.Interaction, resp).Do(ctx)
if err != nil {
bot.Logger(ctx).Error("sending bad input message", "error", err)
}
@@ -60,7 +60,7 @@ func HandleTimeReduceSet(ctx context.Context, dg bot.Session, i *interaction.Mod
IsEphemeral().
Message("Le nombre de jours doit être suppérieur à 30.").
Response()
- err = dg.InteractionAPI().Respond(i.Interaction, resp).Do(ctx)
+ err = interaction.Respond(i.Interaction, resp).Do(ctx)
if err != nil {
bot.Logger(ctx).Error("sending less than 30 days message", "error", err)
}
diff --git a/config/xp_role.go b/config/xp_role.go
index edf5f61..e00d3f7 100644
--- a/config/xp_role.go
+++ b/config/xp_role.go
@@ -89,7 +89,7 @@ func HandleXpRole(ctx context.Context, dg bot.Session, i *interaction.Interactio
Flags: channel.MessageFlagsIsComponentsV2,
},
}
- err := dg.InteractionAPI().Respond(i, response).Do(ctx)
+ err := interaction.Respond(i, response).Do(ctx)
if err != nil {
bot.Logger(ctx).Error("sending config", "error", err)
}
@@ -121,7 +121,7 @@ func HandleXpRoleNew(ctx context.Context, dg bot.Session, i *interaction.Message
},
}).
Response()
- err := dg.InteractionAPI().Respond(i.Interaction, resp).Do(ctx)
+ err := interaction.Respond(i.Interaction, resp).Do(ctx)
if err != nil {
bot.Logger(ctx).Error("sending modal to add", "error", err)
}
@@ -181,7 +181,7 @@ func HandleXpRoleEdit(ctx context.Context, dg bot.Session, i *interaction.Intera
},
}
- err := dg.InteractionAPI().Respond(i, response).Do(ctx)
+ err := interaction.Respond(i, response).Do(ctx)
if err != nil {
bot.Logger(ctx).Error("sending xp_role config", "error", err)
}
@@ -193,7 +193,7 @@ func HandleXpRoleEditRole(ctx context.Context, dg bot.Session, i *interaction.Me
cfg := GetGuildConfig(ctx, i.GuildID)
_, xpRole := cfg.FindXpRoleID(id)
if xpRole == nil {
- err := dg.InteractionAPI().Respond(i.Interaction, &interaction.Response{
+ err := interaction.Respond(i.Interaction, &interaction.Response{
Type: types.InteractionResponseChannelMessageWithSource,
Data: &interaction.ResponseData{
Flags: channel.MessageFlagsEphemeral,
@@ -218,7 +218,7 @@ func HandleXpRoleEditLevelStart(ctx context.Context, dg bot.Session, i *interact
cfg := GetGuildConfig(ctx, i.GuildID)
_, xpRole := cfg.FindXpRoleID(id)
if xpRole == nil {
- err := dg.InteractionAPI().Respond(i.Interaction, &interaction.Response{
+ err := interaction.Respond(i.Interaction, &interaction.Response{
Type: types.InteractionResponseChannelMessageWithSource,
Data: &interaction.ResponseData{
Flags: channel.MessageFlagsEphemeral,
@@ -251,7 +251,7 @@ func HandleXpRoleEditLevelStart(ctx context.Context, dg bot.Session, i *interact
},
},
}
- err := dg.InteractionAPI().Respond(i.Interaction, response).Do(ctx)
+ err := interaction.Respond(i.Interaction, response).Do(ctx)
if err != nil {
bot.Logger(ctx).Error("sending edit level modal", "error", err)
}
@@ -267,7 +267,7 @@ func HandleXpRoleEditLevel(ctx context.Context, dg bot.Session, i *interaction.M
IsEphemeral().
Message(fmt.Sprintf("Le niveau doit être un nombre entier positif.\n-# Trouvé : %s", levelInput.Value)).
Response()
- err = dg.InteractionAPI().Respond(i.Interaction, resp).Do(ctx)
+ err = interaction.Respond(i.Interaction, resp).Do(ctx)
if err != nil {
bot.Logger(ctx).Error("sending bad number warning message", "error", err)
}
@@ -278,7 +278,7 @@ func HandleXpRoleEditLevel(ctx context.Context, dg bot.Session, i *interaction.M
cfg := GetGuildConfig(ctx, i.GuildID)
_, xpRole := cfg.FindXpRoleID(id)
if xpRole == nil {
- err = dg.InteractionAPI().Respond(i.Interaction, &interaction.Response{
+ err = interaction.Respond(i.Interaction, &interaction.Response{
Type: types.InteractionResponseChannelMessageWithSource,
Data: &interaction.ResponseData{
Flags: channel.MessageFlagsEphemeral,
@@ -303,7 +303,7 @@ func HandleXpRoleDel(ctx context.Context, dg bot.Session, i *interaction.Message
cfg := GetGuildConfig(ctx, i.GuildID)
_, role := cfg.FindXpRoleID(id)
if role == nil {
- err := dg.InteractionAPI().Respond(i.Interaction, &interaction.Response{
+ err := interaction.Respond(i.Interaction, &interaction.Response{
Type: types.InteractionResponseChannelMessageWithSource,
Data: &interaction.ResponseData{
Content: "Rôle introuvable. Peut-être a-t-il déjà été supprimé ?",
@@ -332,7 +332,7 @@ func HandleXpRoleAdd(ctx context.Context, dg bot.Session, i *interaction.ModalSu
IsEphemeral().
Message(fmt.Sprintf("Le niveau doit être un nombre entier positif.\n-# Trouvé : %s", levelInput.Value)).
Response()
- err = dg.InteractionAPI().Respond(i.Interaction, resp).Do(ctx)
+ err = interaction.Respond(i.Interaction, resp).Do(ctx)
if err != nil {
bot.Logger(ctx).Error("sending bad number warning message", "error", err)
}