aboutsummaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/xp_reduce.go23
-rw-r--r--config/xp_role.go18
2 files changed, 23 insertions, 18 deletions
diff --git a/config/xp_reduce.go b/config/xp_reduce.go
index 8e97c26..ce5f23c 100644
--- a/config/xp_reduce.go
+++ b/config/xp_reduce.go
@@ -1,11 +1,12 @@
package config
import (
+ "strconv"
+
"github.com/anhgelus/gokord/cmd"
"github.com/anhgelus/gokord/component"
"github.com/anhgelus/gokord/logger"
"github.com/bwmarrin/discordgo"
- "strconv"
)
const (
@@ -14,11 +15,13 @@ const (
)
func HandleModifyPeriodicReduce(_ *discordgo.Session, _ *discordgo.InteractionCreate, _ discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) {
- err := resp.IsModal().SetComponents(component.New().ForModal().Add(component.NewActionRow().Add(
- component.NewTextInput(TimeReduceSet, "Jours avant la réduction", discordgo.TextInputShort).
- SetMinLength(1).
- SetMaxLength(3),
- ))).Send()
+ err := resp.IsModal().
+ SetCustomID(TimeReduceSet).
+ SetComponents(component.New().ForModal().Add(component.NewActionRow().ForModal().Add(
+ component.NewTextInput(TimeReduceSet, "Jours avant la réduction", discordgo.TextInputShort).
+ SetMinLength(1).
+ SetMaxLength(3),
+ ))).Send()
if err != nil {
logger.Alert("config/xp_reduce.go - Sending modal for periodic reduce", err.Error())
}
@@ -31,14 +34,14 @@ func HandleTimeReduceSet(_ *discordgo.Session, i *discordgo.InteractionCreate, d
if err != nil {
logger.Debug(err.Error())
if err = resp.SetMessage("Nombres de jours invalides. Merci de mettre un entier.").Send(); err != nil {
- logger.Alert("config/channel.go - Sending bad input", err.Error())
+ logger.Alert("config/xp_reduce.go - Sending bad input", err.Error())
}
return
}
if days < 30 {
err = resp.SetMessage("Le nombre de jours est inférieur à 30.").Send()
if err != nil {
- logger.Alert("commands/config.go - Days < 30 (fallback)", err.Error())
+ logger.Alert("config/xp_reduce.go - Days < 30 (fallback)", err.Error())
}
return
}
@@ -47,11 +50,11 @@ func HandleTimeReduceSet(_ *discordgo.Session, i *discordgo.InteractionCreate, d
if err = cfg.Save(); err != nil {
logger.Alert("config/channel.go - Saving days xp remains", err.Error())
if err = resp.SetMessage("Erreur lors de la sauvegarde du salon").Send(); err != nil {
- logger.Alert("config/channel.go - Sending error while saving days xp remains", err.Error())
+ logger.Alert("config/xp_reduce.go - Sending error while saving days xp remains", err.Error())
}
return
}
if err = resp.SetMessage("Modification sauvegardée.").Send(); err != nil {
- logger.Alert("config/channel.go - Sending days saved", err.Error())
+ logger.Alert("config/xp_reduce.go - Sending days saved", err.Error())
}
}
diff --git a/config/xp_role.go b/config/xp_role.go
index 27981c0..dac980c 100644
--- a/config/xp_role.go
+++ b/config/xp_role.go
@@ -2,13 +2,14 @@ package config
import (
"fmt"
+ "strconv"
+ "time"
+
"github.com/anhgelus/gokord"
"github.com/anhgelus/gokord/cmd"
"github.com/anhgelus/gokord/component"
"github.com/anhgelus/gokord/logger"
"github.com/bwmarrin/discordgo"
- "strconv"
- "time"
)
type XpRole struct {
@@ -52,7 +53,7 @@ func HandleModifyXpRole(_ *discordgo.Session, _ *discordgo.InteractionCreate, _
),
)).Send()
if err != nil {
- logger.Alert("config/guild.go - Sending config", err.Error())
+ logger.Alert("config/xp_reduce.go - Sending config", err.Error())
}
}
@@ -63,7 +64,8 @@ func HandleXpRoleAddEdit(_ *discordgo.Session, _ *discordgo.InteractionCreate, d
}
err := resp.IsModal().
SetTitle("Role").
- SetComponents(component.New().ForModal().Add(component.NewActionRow().Add(
+ SetCustomID(cID).
+ SetComponents(component.New().ForModal().Add(component.NewActionRow().ForModal().Add(
component.NewTextInput(cID, "Niveau", discordgo.TextInputShort).
SetPlaceholder("5").
IsRequired().
@@ -72,7 +74,7 @@ func HandleXpRoleAddEdit(_ *discordgo.Session, _ *discordgo.InteractionCreate, d
))).
Send()
if err != nil {
- logger.Alert("config/guild.go - Sending modal to add/edit", err.Error())
+ logger.Alert("config/xp_reduce.go - Sending modal to add/edit", err.Error())
}
}
@@ -142,7 +144,7 @@ func HandleXpRoleDel(_ *discordgo.Session, _ *discordgo.InteractionCreate, _ dis
SetComponents(component.New().Add(component.NewActionRow().Add(component.NewRoleSelect(XpRoleDelRole)))).
Send()
if err != nil {
- logger.Alert("config/guild.go - Sending response to del", err.Error())
+ logger.Alert("config/xp_reduce.go - Sending response to del", err.Error())
}
}
@@ -204,10 +206,10 @@ func HandleXpRoleLevel(_ *discordgo.Session, i *discordgo.InteractionCreate, dat
SetComponents(component.New().Add(component.NewActionRow().Add(component.NewRoleSelect(cID)))).
Send()
if err != nil {
- logger.Alert("config/guild.go - Sending response to add/edit", err.Error())
+ logger.Alert("config/xp_reduce.go - Sending response to add/edit", err.Error())
}
}
func getKeyConfigRole(i *discordgo.InteractionCreate) string {
- return fmt.Sprintf("r:%s:%s", i.GuildID, i.User.ID)
+ return fmt.Sprintf("r:%s:%s", i.GuildID, i.Member.User.ID)
}