From 5a8da1eaeb9434a18e553a5c50490d06b54a6a1d Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Wed, 6 Aug 2025 02:22:06 +0200 Subject: build(gokord): upgrade to latest version --- config/guild.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/guild.go b/config/guild.go index fb7eaef..0606ed0 100644 --- a/config/guild.go +++ b/config/guild.go @@ -2,7 +2,7 @@ package config import ( "github.com/anhgelus/gokord" - "github.com/anhgelus/gokord/utils" + "github.com/anhgelus/gokord/logger" "strings" ) @@ -25,7 +25,7 @@ type XpRole struct { func GetGuildConfig(guildID string) *GuildConfig { cfg := GuildConfig{GuildID: guildID} if err := cfg.Load(); err != nil { - utils.SendAlert("config/guild.go - Loading guild config", err.Error(), "guild_id", guildID) + logger.Alert("config/guild.go - Loading guild config", err.Error(), "guild_id", guildID) return nil } return &cfg -- cgit v1.2.3 From 0968c18b15c5fe58c0220fa20ef6a87000bd1a1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Herg=C3=A8s?= Date: Wed, 6 Aug 2025 15:02:51 +0200 Subject: style(config): move everything related to modify xp role in package config --- config/guild.go | 7 -- config/xp_role.go | 214 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 214 insertions(+), 7 deletions(-) create mode 100644 config/xp_role.go (limited to 'config') diff --git a/config/guild.go b/config/guild.go index 0606ed0..3071d95 100644 --- a/config/guild.go +++ b/config/guild.go @@ -15,13 +15,6 @@ type GuildConfig struct { DaysXPRemains uint `gorm:"default:90"` // 30 * 3 = 90 (three months) } -type XpRole struct { - ID uint `gorm:"primarykey"` - XP uint - RoleID string - GuildConfigID uint -} - func GetGuildConfig(guildID string) *GuildConfig { cfg := GuildConfig{GuildID: guildID} if err := cfg.Load(); err != nil { diff --git a/config/xp_role.go b/config/xp_role.go new file mode 100644 index 0000000..bed5c57 --- /dev/null +++ b/config/xp_role.go @@ -0,0 +1,214 @@ +package config + +import ( + "fmt" + "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 { + ID uint `gorm:"primarykey"` + XP uint + RoleID string + GuildConfigID uint +} + +const ( + ModifyXpRole = "xp_role" + XpRoleAdd = "xp_role_add" + XpRoleAddLevel = "xp_role_add_level" + XpRoleAddRole = "xp_role_add_role" + XpRoleDel = "xp_role_del" + XpRoleDelRole = "xp_role_del_role" + XpRoleEdit = "xp_role_edit" + XpRoleEditLevel = "xp_role_edit_level" + XpRoleEditRole = "xp_role_edit_role" +) + +var ( + configModifyMap = map[string]uint{} +) + +func HandleModifyXpRole(_ *discordgo.Session, _ *discordgo.InteractionCreate, _ discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) { + err := resp.IsEphemeral(). + SetMessage("Action à réaliser"). + SetComponents(component.New().Add(component.NewActionRow().Add( + component.NewStringSelect(ModifyXpRole).SetPlaceholder("Action"). + AddOption( + component.NewSelectOption("Ajouter", XpRoleAdd). + SetDescription("Ajouter un rôle à XP"). + SetEmoji(&discordgo.ComponentEmoji{Name: "⬆️"}), + ). + AddOption( + component.NewSelectOption("Modifier", XpRoleEdit). + SetDescription("Modifier un rôle à XP"). + SetEmoji(&discordgo.ComponentEmoji{Name: "📝"}), + ). + AddOption( + component.NewSelectOption("Supprimer", XpRoleDel). + SetDescription("Supprimer un rôle à XP"). + SetEmoji(&discordgo.ComponentEmoji{Name: "❌"}), + ), + ))).Send() + if err != nil { + logger.Alert("config/guild.go - Sending config", err.Error()) + } +} + +func HandleXpRoleAddEdit(_ *discordgo.Session, _ *discordgo.InteractionCreate, data discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) { + cID := XpRoleAddLevel + if data.CustomID == XpRoleEdit { + cID = XpRoleEditLevel + } + err := resp.IsModal(). + SetTitle("Role"). + SetComponents(component.New().ForModal().Add(component.NewActionRow().Add( + component.NewTextInput(cID, "Niveau", discordgo.TextInputShort). + SetPlaceholder("5"). + IsRequired(). + SetMinLength(0). + SetMaxLength(5), + ))). + Send() + if err != nil { + logger.Alert("config/guild.go - Sending modal to add/edit", err.Error()) + } +} + +func HandleXpRoleAddRole(_ *discordgo.Session, i *discordgo.InteractionCreate, data discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) { + cfg := GetGuildConfig(i.GuildID) + roleId := data.Values[0] + for _, r := range cfg.XpRoles { + if r.RoleID == roleId { + err := resp.SetMessage("Le rôle est déjà présent dans la config").Send() + if err != nil { + logger.Alert("commands/config.go - Role already in config", err.Error()) + } + return + } + } + cfg.XpRoles = append(cfg.XpRoles, XpRole{ + XP: configModifyMap[getKeyConfigRole(i)], + RoleID: roleId, + }) + err := cfg.Save() + if err != nil { + logger.Alert( + "commands/config.go - Saving config", + err.Error(), + "guild_id", i.GuildID, + "role_id", roleId, + "type", "add", + ) + } + if err = resp.IsEphemeral().SetMessage("Rôle ajouté.").Send(); err != nil { + logger.Alert("commands/config.go - Sending success", err.Error()) + } +} + +func HandleXpRoleEditRole(_ *discordgo.Session, i *discordgo.InteractionCreate, data discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) { + cfg := GetGuildConfig(i.GuildID) + roleId := data.Values[0] + _, r := cfg.FindXpRole(roleId) + if r == nil { + err := resp.SetMessage("Le rôle n'a pas été trouvé dans la config.").Send() + if err != nil { + logger.Alert("commands/config.go - Role not found (edit)", err.Error()) + } + return + } + r.XP = configModifyMap[getKeyConfigRole(i)] + err := gokord.DB.Save(r).Error + if err != nil { + logger.Alert( + "commands/config.go - Saving config", + err.Error(), + "guild_id", i.GuildID, + "role_id", roleId, + "type", "edit", + ) + } + if err = resp.IsEphemeral().SetMessage("Rôle modifié.").Send(); err != nil { + logger.Alert("commands/config.go - Sending success", err.Error()) + } +} + +func HandleXpRoleDel(_ *discordgo.Session, _ *discordgo.InteractionCreate, _ discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) { + err := resp.IsEphemeral(). + SetMessage("Rôle à supprimer"). + 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()) + } +} + +func HandleXpRoleDelRole(_ *discordgo.Session, i *discordgo.InteractionCreate, data discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) { + cfg := GetGuildConfig(i.GuildID) + roleId := data.Values[0] + _, r := cfg.FindXpRole(roleId) + if r == nil { + err := resp.SetMessage("Le rôle n'a pas été trouvé dans la config.").Send() + if err != nil { + logger.Alert("commands/config.go - Sending role not found (del)", err.Error()) + } + return + } + err := gokord.DB.Delete(r).Error + if err != nil { + logger.Alert( + "commands/config.go - Deleting entry", + err.Error(), + "guild_id", i.GuildID, + "role_id", roleId, + "type", "del", + ) + } + if err = resp.IsEphemeral().SetMessage("Rôle supprimé.").Send(); err != nil { + logger.Alert("commands/config.go - Sending success", err.Error()) + } +} + +func HandleXpRoleLevel(_ *discordgo.Session, i *discordgo.InteractionCreate, data discordgo.ModalSubmitInteractionData, resp *cmd.ResponseBuilder) { + input := data.Components[0].(*discordgo.ActionsRow).Components[0].(*discordgo.TextInput) + + k := getKeyConfigRole(i) + in, err := strconv.Atoi(input.Value) + if err != nil || in < 0 { + if err = resp.IsEphemeral(). + SetMessage("Impossible de lire le nombre. Il doit s'agit d'un nombre entier positif."). + Send(); err != nil { + logger.Alert("command/config.go - Sending bad number", err.Error()) + } + return + } + configModifyMap[k] = uint(in) + go func(i *discordgo.InteractionCreate, k string) { + time.Sleep(5 * time.Minute) + delete(configModifyMap, k) + }(i, k) + + cID := XpRoleAddRole + resp.SetMessage("Rôle à ajouter") + if data.CustomID == XpRoleEditLevel { + cID = XpRoleEditLevel + resp.SetMessage("Rôle à modifier") + } + + err = resp.IsEphemeral(). + SetMessage("Rôle à supprimer"). + 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()) + } +} + +func getKeyConfigRole(i *discordgo.InteractionCreate) string { + return fmt.Sprintf("r:%s:%s", i.GuildID, i.User.ID) +} -- cgit v1.2.3 From 6d19ef42c4135dac57c23bf6d00041423255598d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Herg=C3=A8s?= Date: Wed, 6 Aug 2025 15:13:19 +0200 Subject: refactor(config): handle fallback channel --- config/channel.go | 43 +++++++++++++++++++++++++++++++++++++++++++ config/xp_role.go | 18 +++++++++--------- 2 files changed, 52 insertions(+), 9 deletions(-) create mode 100644 config/channel.go (limited to 'config') diff --git a/config/channel.go b/config/channel.go new file mode 100644 index 0000000..2ef8b48 --- /dev/null +++ b/config/channel.go @@ -0,0 +1,43 @@ +package config + +import ( + "github.com/anhgelus/gokord/cmd" + "github.com/anhgelus/gokord/component" + "github.com/anhgelus/gokord/logger" + "github.com/bwmarrin/discordgo" +) + +const ( + ModifyDisChannel = "disabled_channel" + ModifyFallbackChannel = "fallback_channel" + FallbackChannelSet = "fallback_channel_set" +) + +func HandleModifyFallbackChannel(_ *discordgo.Session, _ *discordgo.InteractionCreate, _ discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) { + err := resp.SetMessage("Salon de repli...").SetComponents(component.New().Add(component.NewActionRow().Add( + component.NewChannelSelect(FallbackChannelSet).AddChannelType(discordgo.ChannelTypeGuildText), + ))).Send() + if err != nil { + logger.Alert("config/channel.go - Sending channel list", err.Error()) + } +} + +func HandleFallbackChannelSet(_ *discordgo.Session, i *discordgo.InteractionCreate, data discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) { + resp.IsEphemeral() + + cfg := GetGuildConfig(i.GuildID) + channelID := data.Values[0] + + cfg.FallbackChannel = channelID + err := cfg.Save() + if err != nil { + logger.Alert("config/channel.go - Saving fallback channel", 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 channel", err.Error()) + } + return + } + if err = resp.SetMessage("Salon sauvegardé.").Send(); err != nil { + logger.Alert("config/channel.go - Sending channel saved", err.Error()) + } +} diff --git a/config/xp_role.go b/config/xp_role.go index bed5c57..8f98265 100644 --- a/config/xp_role.go +++ b/config/xp_role.go @@ -87,7 +87,7 @@ func HandleXpRoleAddRole(_ *discordgo.Session, i *discordgo.InteractionCreate, d if r.RoleID == roleId { err := resp.SetMessage("Le rôle est déjà présent dans la config").Send() if err != nil { - logger.Alert("commands/config.go - Role already in config", err.Error()) + logger.Alert("config/xp_role.go - Role already in config", err.Error()) } return } @@ -99,7 +99,7 @@ func HandleXpRoleAddRole(_ *discordgo.Session, i *discordgo.InteractionCreate, d err := cfg.Save() if err != nil { logger.Alert( - "commands/config.go - Saving config", + "config/xp_role.go - Saving config", err.Error(), "guild_id", i.GuildID, "role_id", roleId, @@ -107,7 +107,7 @@ func HandleXpRoleAddRole(_ *discordgo.Session, i *discordgo.InteractionCreate, d ) } if err = resp.IsEphemeral().SetMessage("Rôle ajouté.").Send(); err != nil { - logger.Alert("commands/config.go - Sending success", err.Error()) + logger.Alert("config/xp_role.go - Sending success", err.Error()) } } @@ -118,7 +118,7 @@ func HandleXpRoleEditRole(_ *discordgo.Session, i *discordgo.InteractionCreate, if r == nil { err := resp.SetMessage("Le rôle n'a pas été trouvé dans la config.").Send() if err != nil { - logger.Alert("commands/config.go - Role not found (edit)", err.Error()) + logger.Alert("config/xp_role.go - Role not found (edit)", err.Error()) } return } @@ -126,7 +126,7 @@ func HandleXpRoleEditRole(_ *discordgo.Session, i *discordgo.InteractionCreate, err := gokord.DB.Save(r).Error if err != nil { logger.Alert( - "commands/config.go - Saving config", + "config/xp_role.go - Saving config", err.Error(), "guild_id", i.GuildID, "role_id", roleId, @@ -134,7 +134,7 @@ func HandleXpRoleEditRole(_ *discordgo.Session, i *discordgo.InteractionCreate, ) } if err = resp.IsEphemeral().SetMessage("Rôle modifié.").Send(); err != nil { - logger.Alert("commands/config.go - Sending success", err.Error()) + logger.Alert("config/xp_role.go - Sending success", err.Error()) } } @@ -155,14 +155,14 @@ func HandleXpRoleDelRole(_ *discordgo.Session, i *discordgo.InteractionCreate, d if r == nil { err := resp.SetMessage("Le rôle n'a pas été trouvé dans la config.").Send() if err != nil { - logger.Alert("commands/config.go - Sending role not found (del)", err.Error()) + logger.Alert("config/xp_role.go - Sending role not found (del)", err.Error()) } return } err := gokord.DB.Delete(r).Error if err != nil { logger.Alert( - "commands/config.go - Deleting entry", + "config/xp_role.go - Deleting entry", err.Error(), "guild_id", i.GuildID, "role_id", roleId, @@ -170,7 +170,7 @@ func HandleXpRoleDelRole(_ *discordgo.Session, i *discordgo.InteractionCreate, d ) } if err = resp.IsEphemeral().SetMessage("Rôle supprimé.").Send(); err != nil { - logger.Alert("commands/config.go - Sending success", err.Error()) + logger.Alert("config/xp_role.go - Sending success", err.Error()) } } -- cgit v1.2.3 From 51a412b32d2ab690bb2bb571f9337a69aae41ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Herg=C3=A8s?= Date: Wed, 6 Aug 2025 15:19:31 +0200 Subject: refactor(config): use button to select action for xp role --- config/xp_role.go | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) (limited to 'config') diff --git a/config/xp_role.go b/config/xp_role.go index 8f98265..4a99b30 100644 --- a/config/xp_role.go +++ b/config/xp_role.go @@ -37,24 +37,20 @@ var ( func HandleModifyXpRole(_ *discordgo.Session, _ *discordgo.InteractionCreate, _ discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) { err := resp.IsEphemeral(). SetMessage("Action à réaliser"). - SetComponents(component.New().Add(component.NewActionRow().Add( - component.NewStringSelect(ModifyXpRole).SetPlaceholder("Action"). - AddOption( - component.NewSelectOption("Ajouter", XpRoleAdd). - SetDescription("Ajouter un rôle à XP"). - SetEmoji(&discordgo.ComponentEmoji{Name: "⬆️"}), - ). - AddOption( - component.NewSelectOption("Modifier", XpRoleEdit). - SetDescription("Modifier un rôle à XP"). - SetEmoji(&discordgo.ComponentEmoji{Name: "📝"}), - ). - AddOption( - component.NewSelectOption("Supprimer", XpRoleDel). - SetDescription("Supprimer un rôle à XP"). - SetEmoji(&discordgo.ComponentEmoji{Name: "❌"}), - ), - ))).Send() + SetComponents(component.New().Add(component.NewActionRow(). + Add(component.NewButton(XpRoleAdd, discordgo.PrimaryButton). + SetLabel("Ajouter"). + SetEmoji(&discordgo.ComponentEmoji{Name: "⬆️"}), + ). + Add(component.NewButton(XpRoleEdit, discordgo.SecondaryButton). + SetLabel("Modifier"). + SetEmoji(&discordgo.ComponentEmoji{Name: "📝"}), + ). + Add(component.NewButton(XpRoleDel, discordgo.DangerButton). + SetLabel("Supprimer"). + SetEmoji(&discordgo.ComponentEmoji{Name: "❌"}), + ), + )).Send() if err != nil { logger.Alert("config/guild.go - Sending config", err.Error()) } -- cgit v1.2.3 From 0b93ea5daaee317a45291df188af13a6fab0c481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Herg=C3=A8s?= Date: Wed, 6 Aug 2025 15:35:10 +0200 Subject: refactor(config): handle xp reduce --- config/xp_reduce.go | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++ config/xp_role.go | 2 +- 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 config/xp_reduce.go (limited to 'config') diff --git a/config/xp_reduce.go b/config/xp_reduce.go new file mode 100644 index 0000000..8e97c26 --- /dev/null +++ b/config/xp_reduce.go @@ -0,0 +1,57 @@ +package config + +import ( + "github.com/anhgelus/gokord/cmd" + "github.com/anhgelus/gokord/component" + "github.com/anhgelus/gokord/logger" + "github.com/bwmarrin/discordgo" + "strconv" +) + +const ( + ModifyTimeReduce = "time_reduce" + TimeReduceSet = "time_reduce_set" +) + +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() + if err != nil { + logger.Alert("config/xp_reduce.go - Sending modal for periodic reduce", err.Error()) + } +} + +func HandleTimeReduceSet(_ *discordgo.Session, i *discordgo.InteractionCreate, data discordgo.ModalSubmitInteractionData, resp *cmd.ResponseBuilder) { + resp.IsEphemeral() + v := data.Components[0].(*discordgo.ActionsRow).Components[0].(*discordgo.TextInput).Value + days, err := strconv.Atoi(v) + 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()) + } + 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()) + } + return + } + cfg := GetGuildConfig(i.GuildID) + cfg.DaysXPRemains = uint(days) + 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()) + } + return + } + if err = resp.SetMessage("Modification sauvegardée.").Send(); err != nil { + logger.Alert("config/channel.go - Sending days saved", err.Error()) + } +} diff --git a/config/xp_role.go b/config/xp_role.go index 4a99b30..b01da27 100644 --- a/config/xp_role.go +++ b/config/xp_role.go @@ -192,7 +192,7 @@ func HandleXpRoleLevel(_ *discordgo.Session, i *discordgo.InteractionCreate, dat cID := XpRoleAddRole resp.SetMessage("Rôle à ajouter") if data.CustomID == XpRoleEditLevel { - cID = XpRoleEditLevel + cID = XpRoleEditRole resp.SetMessage("Rôle à modifier") } -- cgit v1.2.3 From b9466f812284bb6feb793de6229cf7266dc24361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Herg=C3=A8s?= Date: Wed, 6 Aug 2025 15:51:17 +0200 Subject: refactor(config): handle disabled channels --- config/channel.go | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 83 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/channel.go b/config/channel.go index 2ef8b48..7b74169 100644 --- a/config/channel.go +++ b/config/channel.go @@ -5,12 +5,18 @@ import ( "github.com/anhgelus/gokord/component" "github.com/anhgelus/gokord/logger" "github.com/bwmarrin/discordgo" + "strings" ) const ( - ModifyDisChannel = "disabled_channel" ModifyFallbackChannel = "fallback_channel" FallbackChannelSet = "fallback_channel_set" + + ModifyDisChannel = "disabled_channel" + DisChannelAdd = "disabled_channel_add" + DisChannelAddSet = "disabled_channel_add_set" + DisChannelDel = "disabled_channel_del" + DisChannelDelSet = "disabled_channel_del_set" ) func HandleModifyFallbackChannel(_ *discordgo.Session, _ *discordgo.InteractionCreate, _ discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) { @@ -18,7 +24,7 @@ func HandleModifyFallbackChannel(_ *discordgo.Session, _ *discordgo.InteractionC component.NewChannelSelect(FallbackChannelSet).AddChannelType(discordgo.ChannelTypeGuildText), ))).Send() if err != nil { - logger.Alert("config/channel.go - Sending channel list", err.Error()) + logger.Alert("config/channel.go - Sending channel list for fallback", err.Error()) } } @@ -41,3 +47,78 @@ func HandleFallbackChannelSet(_ *discordgo.Session, i *discordgo.InteractionCrea logger.Alert("config/channel.go - Sending channel saved", err.Error()) } } + +func HandleModifyDisChannel(_ *discordgo.Session, _ *discordgo.InteractionCreate, _ discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) { + err := resp.SetMessage("Salon de repli...").SetComponents(component.New().Add(component.NewActionRow(). + Add( + component.NewButton(DisChannelAdd, discordgo.PrimaryButton). + SetLabel("Désactiver un salon"). + SetEmoji(&discordgo.ComponentEmoji{Name: "⬇️"}), + ). + Add( + component.NewButton(DisChannelDel, discordgo.DangerButton). + SetLabel("Réactiver un salon"). + SetEmoji(&discordgo.ComponentEmoji{Name: "⬆️"}), + ), + )).Send() + if err != nil { + logger.Alert("config/channel.go - Sending action type", err.Error()) + } +} + +func HandleDisChannel(_ *discordgo.Session, _ *discordgo.InteractionCreate, data discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) { + resp.SetMessage("Salon à désactiver...") + cID := DisChannelAddSet + if data.CustomID == DisChannelDel { + resp.SetMessage("Salon à réactiver...") + cID = DisChannelDelSet + } + err := resp.SetComponents(component.New().Add(component.NewActionRow().Add(component.NewChannelSelect(cID)))).Send() + if err != nil { + logger.Alert("config/channel.go - Sending channel list for disable", err.Error()) + } +} + +func HandleDisChannelAddSet(_ *discordgo.Session, i *discordgo.InteractionCreate, data discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) { + cfg := GetGuildConfig(i.GuildID) + id := data.Values[0] + if strings.Contains(cfg.DisabledChannels, id) { + err := resp.SetMessage("Le salon est déjà dans la liste des salons désactivés").Send() + if err != nil { + logger.Alert("commands/config.go - Channel already disabled", err.Error()) + } + return + } + cfg.DisabledChannels += id + ";" + if err := cfg.Save(); err != nil { + logger.Alert("commands/config.go - Saving config disable add", err.Error()) + if err = resp.SetMessage("Il y a eu une erreur lors de la modification de de la base de données.").Send(); err != nil { + logger.Alert("config/channel.go - Sending error while saving config", err.Error()) + } + } + if err := resp.SetMessage("Modification sauvegardé.").Send(); err != nil { + logger.Alert("commands/config.go - Modification saved message disable add", err.Error()) + } +} + +func HandleDisChannelDelSet(_ *discordgo.Session, i *discordgo.InteractionCreate, data discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) { + cfg := GetGuildConfig(i.GuildID) + id := data.Values[0] + if !strings.Contains(cfg.DisabledChannels, id) { + err := resp.SetMessage("Le salon n'est pas désactivé").Send() + if err != nil { + logger.Alert("commands/config.go - Channel not disabled", err.Error()) + } + return + } + cfg.DisabledChannels = strings.ReplaceAll(cfg.DisabledChannels, id+";", "") + if err := cfg.Save(); err != nil { + logger.Alert("commands/config.go - Saving config disable del", err.Error()) + if err = resp.SetMessage("Il y a eu une erreur lors de la modification de de la base de données.").Send(); err != nil { + logger.Alert("config/channel.go - Sending error while saving config", err.Error()) + } + } + if err := resp.SetMessage("Modification sauvegardé.").Send(); err != nil { + logger.Alert("commands/config.go - Modification saved message disable del", err.Error()) + } +} -- cgit v1.2.3 From 7c9d6571fd6179837ca9fb9d30bf2ea82dc81197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Herg=C3=A8s?= Date: Wed, 6 Aug 2025 16:14:30 +0200 Subject: fix(config): not all interaction were ephemeral --- config/channel.go | 8 +++++--- config/xp_role.go | 15 +++++++++------ 2 files changed, 14 insertions(+), 9 deletions(-) (limited to 'config') diff --git a/config/channel.go b/config/channel.go index 7b74169..355b0e1 100644 --- a/config/channel.go +++ b/config/channel.go @@ -20,7 +20,7 @@ const ( ) func HandleModifyFallbackChannel(_ *discordgo.Session, _ *discordgo.InteractionCreate, _ discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) { - err := resp.SetMessage("Salon de repli...").SetComponents(component.New().Add(component.NewActionRow().Add( + err := resp.IsEphemeral().SetComponents(component.New().Add(component.NewActionRow().Add( component.NewChannelSelect(FallbackChannelSet).AddChannelType(discordgo.ChannelTypeGuildText), ))).Send() if err != nil { @@ -49,7 +49,7 @@ func HandleFallbackChannelSet(_ *discordgo.Session, i *discordgo.InteractionCrea } func HandleModifyDisChannel(_ *discordgo.Session, _ *discordgo.InteractionCreate, _ discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) { - err := resp.SetMessage("Salon de repli...").SetComponents(component.New().Add(component.NewActionRow(). + err := resp.IsEphemeral().SetComponents(component.New().Add(component.NewActionRow(). Add( component.NewButton(DisChannelAdd, discordgo.PrimaryButton). SetLabel("Désactiver un salon"). @@ -67,7 +67,7 @@ func HandleModifyDisChannel(_ *discordgo.Session, _ *discordgo.InteractionCreate } func HandleDisChannel(_ *discordgo.Session, _ *discordgo.InteractionCreate, data discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) { - resp.SetMessage("Salon à désactiver...") + resp.IsEphemeral().SetMessage("Salon à désactiver...") cID := DisChannelAddSet if data.CustomID == DisChannelDel { resp.SetMessage("Salon à réactiver...") @@ -80,6 +80,7 @@ func HandleDisChannel(_ *discordgo.Session, _ *discordgo.InteractionCreate, data } func HandleDisChannelAddSet(_ *discordgo.Session, i *discordgo.InteractionCreate, data discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) { + resp.IsEphemeral() cfg := GetGuildConfig(i.GuildID) id := data.Values[0] if strings.Contains(cfg.DisabledChannels, id) { @@ -102,6 +103,7 @@ func HandleDisChannelAddSet(_ *discordgo.Session, i *discordgo.InteractionCreate } func HandleDisChannelDelSet(_ *discordgo.Session, i *discordgo.InteractionCreate, data discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) { + resp.IsEphemeral() cfg := GetGuildConfig(i.GuildID) id := data.Values[0] if !strings.Contains(cfg.DisabledChannels, id) { diff --git a/config/xp_role.go b/config/xp_role.go index b01da27..27981c0 100644 --- a/config/xp_role.go +++ b/config/xp_role.go @@ -77,6 +77,7 @@ func HandleXpRoleAddEdit(_ *discordgo.Session, _ *discordgo.InteractionCreate, d } func HandleXpRoleAddRole(_ *discordgo.Session, i *discordgo.InteractionCreate, data discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) { + resp.IsEphemeral() cfg := GetGuildConfig(i.GuildID) roleId := data.Values[0] for _, r := range cfg.XpRoles { @@ -102,12 +103,13 @@ func HandleXpRoleAddRole(_ *discordgo.Session, i *discordgo.InteractionCreate, d "type", "add", ) } - if err = resp.IsEphemeral().SetMessage("Rôle ajouté.").Send(); err != nil { + if err = resp.SetMessage("Rôle ajouté.").Send(); err != nil { logger.Alert("config/xp_role.go - Sending success", err.Error()) } } func HandleXpRoleEditRole(_ *discordgo.Session, i *discordgo.InteractionCreate, data discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) { + resp.IsEphemeral() cfg := GetGuildConfig(i.GuildID) roleId := data.Values[0] _, r := cfg.FindXpRole(roleId) @@ -129,7 +131,7 @@ func HandleXpRoleEditRole(_ *discordgo.Session, i *discordgo.InteractionCreate, "type", "edit", ) } - if err = resp.IsEphemeral().SetMessage("Rôle modifié.").Send(); err != nil { + if err = resp.SetMessage("Rôle modifié.").Send(); err != nil { logger.Alert("config/xp_role.go - Sending success", err.Error()) } } @@ -145,6 +147,7 @@ func HandleXpRoleDel(_ *discordgo.Session, _ *discordgo.InteractionCreate, _ dis } func HandleXpRoleDelRole(_ *discordgo.Session, i *discordgo.InteractionCreate, data discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) { + resp.IsEphemeral() cfg := GetGuildConfig(i.GuildID) roleId := data.Values[0] _, r := cfg.FindXpRole(roleId) @@ -165,18 +168,19 @@ func HandleXpRoleDelRole(_ *discordgo.Session, i *discordgo.InteractionCreate, d "type", "del", ) } - if err = resp.IsEphemeral().SetMessage("Rôle supprimé.").Send(); err != nil { + if err = resp.SetMessage("Rôle supprimé.").Send(); err != nil { logger.Alert("config/xp_role.go - Sending success", err.Error()) } } func HandleXpRoleLevel(_ *discordgo.Session, i *discordgo.InteractionCreate, data discordgo.ModalSubmitInteractionData, resp *cmd.ResponseBuilder) { + resp.IsEphemeral() input := data.Components[0].(*discordgo.ActionsRow).Components[0].(*discordgo.TextInput) k := getKeyConfigRole(i) in, err := strconv.Atoi(input.Value) if err != nil || in < 0 { - if err = resp.IsEphemeral(). + if err = resp. SetMessage("Impossible de lire le nombre. Il doit s'agit d'un nombre entier positif."). Send(); err != nil { logger.Alert("command/config.go - Sending bad number", err.Error()) @@ -196,8 +200,7 @@ func HandleXpRoleLevel(_ *discordgo.Session, i *discordgo.InteractionCreate, dat resp.SetMessage("Rôle à modifier") } - err = resp.IsEphemeral(). - SetMessage("Rôle à supprimer"). + err = resp. SetComponents(component.New().Add(component.NewActionRow().Add(component.NewRoleSelect(cID)))). Send() if err != nil { -- cgit v1.2.3 From ebab5cd09f73cd68089f59a68431bbc283fba30b Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Thu, 21 Aug 2025 13:33:17 +0200 Subject: feat(command): do not use new components --- config/guild.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'config') diff --git a/config/guild.go b/config/guild.go index 3071d95..8384d5b 100644 --- a/config/guild.go +++ b/config/guild.go @@ -1,9 +1,9 @@ package config import ( - "github.com/anhgelus/gokord" - "github.com/anhgelus/gokord/logger" "strings" + + "github.com/anhgelus/gokord" ) type GuildConfig struct { @@ -18,8 +18,7 @@ type GuildConfig struct { func GetGuildConfig(guildID string) *GuildConfig { cfg := GuildConfig{GuildID: guildID} if err := cfg.Load(); err != nil { - logger.Alert("config/guild.go - Loading guild config", err.Error(), "guild_id", guildID) - return nil + panic(err) } return &cfg } -- cgit v1.2.3 From ecf41adc3c2b8746867a16c8d3c5a09ca89bc534 Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Thu, 21 Aug 2025 14:38:59 +0200 Subject: fix(command): missing custom id for modal --- config/xp_reduce.go | 23 +++++++++++++---------- config/xp_role.go | 18 ++++++++++-------- 2 files changed, 23 insertions(+), 18 deletions(-) (limited to 'config') 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) } -- cgit v1.2.3 From 15448aa0014e1473582227e2ea301df7ccfb9560 Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Thu, 21 Aug 2025 14:53:18 +0200 Subject: fix(config): saving level and not xp for role --- config/xp_role.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/xp_role.go b/config/xp_role.go index dac980c..f815cc2 100644 --- a/config/xp_role.go +++ b/config/xp_role.go @@ -9,6 +9,7 @@ import ( "github.com/anhgelus/gokord/cmd" "github.com/anhgelus/gokord/component" "github.com/anhgelus/gokord/logger" + "github.com/anhgelus/les-copaings-bot/exp" "github.com/bwmarrin/discordgo" ) @@ -189,7 +190,7 @@ func HandleXpRoleLevel(_ *discordgo.Session, i *discordgo.InteractionCreate, dat } return } - configModifyMap[k] = uint(in) + configModifyMap[k] = exp.LevelXP(uint(in)) go func(i *discordgo.InteractionCreate, k string) { time.Sleep(5 * time.Minute) delete(configModifyMap, k) -- cgit v1.2.3