aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--commands/config.go4
-rw-r--r--config/channel.go12
-rw-r--r--config/xp_reduce.go4
-rw-r--r--config/xp_role.go32
-rw-r--r--go.mod4
-rw-r--r--go.sum4
-rw-r--r--main.go26
7 files changed, 45 insertions, 41 deletions
diff --git a/commands/config.go b/commands/config.go
index 1c2db8c..d1e144d 100644
--- a/commands/config.go
+++ b/commands/config.go
@@ -123,8 +123,8 @@ func ConfigCommand(
func ConfigMessageComponent(
session *discordgo.Session,
i *discordgo.InteractionCreate,
- _ interaction.MessageComponentData,
- resp *cmd.ResponseBuilder,
+ _ *interaction.MessageComponentData,
+ _ *cmd.ResponseBuilder,
) {
response := ConfigResponse(i)
response.Type = types.InteractionResponseUpdateMessage
diff --git a/config/channel.go b/config/channel.go
index 918af6d..e5fc81b 100644
--- a/config/channel.go
+++ b/config/channel.go
@@ -19,7 +19,7 @@ const (
DisChannelDelSet = "disabled_channel_del_set"
)
-func HandleModifyFallbackChannel(_ *discordgo.Session, _ *discordgo.InteractionCreate, _ interaction.MessageComponentData, resp *cmd.ResponseBuilder) {
+func HandleModifyFallbackChannel(_ *discordgo.Session, _ *discordgo.InteractionCreate, _ *interaction.MessageComponentData, _ *cmd.ResponseBuilder) {
//err := resp.IsEphemeral().SetComponents(component.New().Add(component.NewActionRow().Add(
// component.NewChannelSelect(FallbackChannelSet).AddChannelType(discordgo.ChannelTypeGuildText),
//))).Send()
@@ -28,7 +28,7 @@ func HandleModifyFallbackChannel(_ *discordgo.Session, _ *discordgo.InteractionC
//}
}
-func HandleFallbackChannelSet(s *discordgo.Session, i *discordgo.InteractionCreate, data interaction.MessageComponentData, resp *cmd.ResponseBuilder) {
+func HandleFallbackChannelSet(s *discordgo.Session, i *discordgo.InteractionCreate, data *interaction.MessageComponentData, resp *cmd.ResponseBuilder) {
resp.IsEphemeral()
cfg := GetGuildConfig(i.GuildID)
@@ -48,7 +48,7 @@ func HandleFallbackChannelSet(s *discordgo.Session, i *discordgo.InteractionCrea
}
}
-func HandleModifyDisChannel(_ *discordgo.Session, _ *discordgo.InteractionCreate, _ interaction.MessageComponentData, resp *cmd.ResponseBuilder) {
+func HandleModifyDisChannel(_ *discordgo.Session, _ *discordgo.InteractionCreate, _ *interaction.MessageComponentData, _ *cmd.ResponseBuilder) {
//err := resp.IsEphemeral().SetComponents(component.New().Add(component.NewActionRow().
// Add(
// component.NewButton(DisChannelAdd, discordgo.PrimaryButton).
@@ -66,7 +66,7 @@ func HandleModifyDisChannel(_ *discordgo.Session, _ *discordgo.InteractionCreate
//}
}
-func HandleDisChannel(_ *discordgo.Session, _ *discordgo.InteractionCreate, data interaction.MessageComponentData, resp *cmd.ResponseBuilder) {
+func HandleDisChannel(_ *discordgo.Session, _ *discordgo.InteractionCreate, data *interaction.MessageComponentData, resp *cmd.ResponseBuilder) {
//resp.IsEphemeral().SetMessage("Salon à désactiver...")
//cID := DisChannelAddSet
//if data.CustomID == DisChannelDel {
@@ -79,7 +79,7 @@ func HandleDisChannel(_ *discordgo.Session, _ *discordgo.InteractionCreate, data
//}
}
-func HandleDisChannelAddSet(_ *discordgo.Session, i *discordgo.InteractionCreate, data interaction.MessageComponentData, resp *cmd.ResponseBuilder) {
+func HandleDisChannelAddSet(_ *discordgo.Session, i *discordgo.InteractionCreate, data *interaction.MessageComponentData, resp *cmd.ResponseBuilder) {
//resp.IsEphemeral()
//cfg := GetGuildConfig(i.GuildID)
//id := data.Values[0]
@@ -102,7 +102,7 @@ func HandleDisChannelAddSet(_ *discordgo.Session, i *discordgo.InteractionCreate
//}
}
-func HandleDisChannelDelSet(s *discordgo.Session, i *discordgo.InteractionCreate, data interaction.MessageComponentData, resp *cmd.ResponseBuilder) {
+func HandleDisChannelDelSet(s *discordgo.Session, i *discordgo.InteractionCreate, data *interaction.MessageComponentData, resp *cmd.ResponseBuilder) {
resp.IsEphemeral()
cfg := GetGuildConfig(i.GuildID)
id := data.Values[0]
diff --git a/config/xp_reduce.go b/config/xp_reduce.go
index 1afe8d7..a61ef1a 100644
--- a/config/xp_reduce.go
+++ b/config/xp_reduce.go
@@ -11,7 +11,7 @@ const (
TimeReduceSet = "time_reduce_set"
)
-func HandleModifyPeriodicReduce(_ *discordgo.Session, _ *discordgo.InteractionCreate, _ interaction.MessageComponentData, resp *cmd.ResponseBuilder) {
+func HandleModifyPeriodicReduce(_ *discordgo.Session, _ *discordgo.InteractionCreate, _ *interaction.MessageComponentData, resp *cmd.ResponseBuilder) {
//err := resp.IsModal().
// SetCustomID(TimeReduceSet).
// SetComponents(component.New().ForModal().Add(component.NewActionRow().ForModal().Add(
@@ -24,7 +24,7 @@ func HandleModifyPeriodicReduce(_ *discordgo.Session, _ *discordgo.InteractionCr
//}
}
-func HandleTimeReduceSet(_ *discordgo.Session, i *discordgo.InteractionCreate, data *interaction.ModalSubmitData, resp *cmd.ResponseBuilder) {
+func HandleTimeReduceSet(_ *discordgo.Session, _ *discordgo.InteractionCreate, _ *interaction.ModalSubmitData, _ *cmd.ResponseBuilder) {
//resp.IsEphemeral()
//v := data.Components[0].(*discordgo.ActionsRow).Components[0].(*discordgo.TextInput).Value
//days, err := strconv.Atoi(v)
diff --git a/config/xp_role.go b/config/xp_role.go
index 3ec8e3a..72af42b 100644
--- a/config/xp_role.go
+++ b/config/xp_role.go
@@ -35,8 +35,8 @@ const (
func HandleXpRole(
session *discordgo.Session,
i *discordgo.InteractionCreate,
- _ interaction.MessageComponentData,
- resp *cmd.ResponseBuilder,
+ _ *interaction.MessageComponentData,
+ _ *cmd.ResponseBuilder,
) {
cfg := GetGuildConfig(i.GuildID)
container := component.Container{
@@ -93,8 +93,8 @@ func HandleXpRole(
func HandleXpRoleNew(
session *discordgo.Session,
i *discordgo.InteractionCreate,
- data interaction.MessageComponentData,
- resp *cmd.ResponseBuilder,
+ _ *interaction.MessageComponentData,
+ _ *cmd.ResponseBuilder,
) {
one := 1
response := &interaction.Response{
@@ -135,7 +135,7 @@ func HandleXpRoleNew(
func HandleXpRoleEdit(
session *discordgo.Session,
i *discordgo.InteractionCreate,
- data interaction.MessageComponentData,
+ _ *interaction.MessageComponentData,
parameters []string, resp *cmd.ResponseBuilder,
) {
config := GetGuildConfig(i.GuildID)
@@ -146,7 +146,7 @@ func HandleXpRoleEdit(
}
_, role := config.FindXpRoleID(id)
if role == nil {
- HandleXpRole(session, i, interaction.MessageComponentData{}, resp)
+ HandleXpRole(session, i, &interaction.MessageComponentData{}, resp)
return
}
@@ -200,7 +200,7 @@ func HandleXpRoleEdit(
func HandleXpRoleEditRole(
session *discordgo.Session,
i *discordgo.InteractionCreate,
- data interaction.MessageComponentData,
+ data *interaction.MessageComponentData,
parameters []string, resp *cmd.ResponseBuilder,
) {
id, err := getRoleLevelID(parameters)
@@ -229,15 +229,15 @@ func HandleXpRoleEditRole(
if err != nil {
session.LogError(err, "Saving config guild_id %s, id %d, type add", i.GuildID, id)
}
- HandleXpRoleEdit(session, i, interaction.MessageComponentData{}, parameters, resp)
+ HandleXpRoleEdit(session, i, &interaction.MessageComponentData{}, parameters, resp)
}
func HandleXpRoleEditLevelStart(
session *discordgo.Session,
i *discordgo.InteractionCreate,
- data interaction.MessageComponentData,
+ _ *interaction.MessageComponentData,
parameters []string,
- resp *cmd.ResponseBuilder,
+ _ *cmd.ResponseBuilder,
) {
id, err := getRoleLevelID(parameters)
if err != nil {
@@ -335,17 +335,17 @@ func HandleXpRoleEditLevel(
if err != nil {
session.LogError(err, "Saving config guild_id %s, id %d, type add", i.GuildID, id)
}
- HandleXpRoleEdit(session, i, interaction.MessageComponentData{}, parameters, resp)
+ HandleXpRoleEdit(session, i, &interaction.MessageComponentData{}, parameters, resp)
}
func HandleXpRoleDel(
session *discordgo.Session,
i *discordgo.InteractionCreate,
- _ interaction.MessageComponentData,
- dynamic_values []string,
+ _ *interaction.MessageComponentData,
+ dynamicValues []string,
resp *cmd.ResponseBuilder,
) {
- id, err := getRoleLevelID(dynamic_values)
+ id, err := getRoleLevelID(dynamicValues)
if err != nil {
session.LogError(err, "reading dynamic CustomID")
return
@@ -370,7 +370,7 @@ func HandleXpRoleDel(
session.LogError(err, "Deleting entry guild_id %s, id %d, type del", i.GuildID, id)
}
- HandleXpRole(session, i, interaction.MessageComponentData{}, resp)
+ HandleXpRole(session, i, &interaction.MessageComponentData{}, resp)
}
func HandleXpRoleAdd(
@@ -408,7 +408,7 @@ func HandleXpRoleAdd(
return
}
- HandleXpRole(session, i, interaction.MessageComponentData{}, resp)
+ HandleXpRole(session, i, &interaction.MessageComponentData{}, resp)
}
func getRoleLevelID(dynamic []string) (uint, error) {
diff --git a/go.mod b/go.mod
index 9201ec1..b587589 100644
--- a/go.mod
+++ b/go.mod
@@ -5,9 +5,9 @@ go 1.24.0
toolchain go1.24.6
require (
- github.com/anhgelus/gokord v0.11.1-0.20250918172043-d5177a0473b0
+ github.com/anhgelus/gokord v0.11.1-0.20250919163649-80ed0b18f923
github.com/joho/godotenv v1.5.1
- github.com/nyttikord/gokord v0.30.1-0.20250918171410-c7667e5caf21
+ github.com/nyttikord/gokord v0.30.1-0.20250919163233-9ebc33ea8afe
github.com/pelletier/go-toml/v2 v2.2.4
gorm.io/driver/postgres v1.6.0
gorm.io/gorm v1.31.0
diff --git a/go.sum b/go.sum
index efad3f8..2ab6829 100644
--- a/go.sum
+++ b/go.sum
@@ -41,6 +41,8 @@ github.com/anhgelus/gokord v0.11.1-0.20250913175430-bf95758b4d3b h1:p9XoghqPoBwj
github.com/anhgelus/gokord v0.11.1-0.20250913175430-bf95758b4d3b/go.mod h1:MKTSrPK2w9VCDYHPQ8KwSAVFEFYF0LU8FaBEhNq4VoU=
github.com/anhgelus/gokord v0.11.1-0.20250918172043-d5177a0473b0 h1:LApN5na4GHlbMYMx+B3RBebrZTnhK6+fyjAUUexowHI=
github.com/anhgelus/gokord v0.11.1-0.20250918172043-d5177a0473b0/go.mod h1:p5aU+u6mGR2pE5h/yM5ysXI8YlMnl8IP/ICRD3Q5zKY=
+github.com/anhgelus/gokord v0.11.1-0.20250919163649-80ed0b18f923 h1:+6qHfzip/A78UbgyhGYPy1Tz/xbZalBNtBIdtj8/PYM=
+github.com/anhgelus/gokord v0.11.1-0.20250919163649-80ed0b18f923/go.mod h1:4/ywDZCTnaImbeK7V84Fob4qm4NbuvaN8PQWZIDzE1w=
github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
@@ -88,6 +90,8 @@ github.com/nyttikord/gokord v0.30.1-0.20250914224716-68c5eb8c8ab2 h1:DHoH/b1SnmJ
github.com/nyttikord/gokord v0.30.1-0.20250914224716-68c5eb8c8ab2/go.mod h1:Oi0y5sfiYa+hVuV5ZSJ9UMWAGkcaLOhM7xB1TiCdX3U=
github.com/nyttikord/gokord v0.30.1-0.20250918171410-c7667e5caf21 h1:P10ofytwmj9/VwWiW+oSL4q2YWn5jb3LEcXAA4e/VYM=
github.com/nyttikord/gokord v0.30.1-0.20250918171410-c7667e5caf21/go.mod h1:Oi0y5sfiYa+hVuV5ZSJ9UMWAGkcaLOhM7xB1TiCdX3U=
+github.com/nyttikord/gokord v0.30.1-0.20250919163233-9ebc33ea8afe h1:X/stBMAS1bfzRVC9A2q5OV0ozPIwl4XPinGZSik5HvU=
+github.com/nyttikord/gokord v0.30.1-0.20250919163233-9ebc33ea8afe/go.mod h1:Oi0y5sfiYa+hVuV5ZSJ9UMWAGkcaLOhM7xB1TiCdX3U=
github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
diff --git a/main.go b/main.go
index 3bca23e..ff8c55a 100644
--- a/main.go
+++ b/main.go
@@ -68,11 +68,11 @@ func init() {
func handleDynamicMessageComponent(
b *gokord.Bot,
handler func(
- *discordgo.Session,
- *discordgo.InteractionCreate,
- interaction.MessageComponentData,
- []string, *cmd.ResponseBuilder,
- ),
+ *discordgo.Session,
+ *discordgo.InteractionCreate,
+ *interaction.MessageComponentData,
+ []string, *cmd.ResponseBuilder,
+),
pattern string,
) {
compiledPattern := regexp.MustCompile(pattern)
@@ -94,12 +94,12 @@ func handleDynamicMessageComponent(
func handleDynamicModalComponent(
b *gokord.Bot,
handler func(
- *discordgo.Session,
- *discordgo.InteractionCreate,
- *interaction.ModalSubmitData,
- []string,
- *cmd.ResponseBuilder,
- ),
+ *discordgo.Session,
+ *discordgo.InteractionCreate,
+ *interaction.ModalSubmitData,
+ []string,
+ *cmd.ResponseBuilder,
+),
pattern string,
) {
compiledPattern := regexp.MustCompile(pattern)
@@ -110,7 +110,7 @@ func handleDynamicModalComponent(
data := i.ModalSubmitData()
content, _ := json.Marshal(data)
- s.LogDebug(string(content))
+ s.LogDebug("%s", content)
parameters := compiledPattern.FindStringSubmatch(data.CustomID)
if parameters == nil {
return
@@ -234,7 +234,7 @@ func main() {
}
// interaction: /config
- bot.HandleMessageComponent(func(s *discordgo.Session, i *discordgo.InteractionCreate, data interaction.MessageComponentData, resp *cmd.ResponseBuilder) {
+ bot.HandleMessageComponent(func(s *discordgo.Session, i *discordgo.InteractionCreate, data *interaction.MessageComponentData, resp *cmd.ResponseBuilder) {
if len(data.Values) != 1 {
bot.LogError(errors.New("invalid data values"), "handle config modify, values: %#v", data.Values)
return
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-03 11:41:07 +0000