diff options
| -rw-r--r-- | commands/config.go | 120 | ||||
| -rw-r--r-- | config/guild.go | 9 | ||||
| -rw-r--r-- | config/xp_role.go | 541 | ||||
| -rw-r--r-- | events.go | 43 | ||||
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | go.sum | 2 | ||||
| -rw-r--r-- | main.go | 78 |
7 files changed, 583 insertions, 212 deletions
diff --git a/commands/config.go b/commands/config.go index cc1e942..1c2db8c 100644 --- a/commands/config.go +++ b/commands/config.go @@ -8,13 +8,19 @@ import ( "git.anhgelus.world/anhgelus/les-copaings-bot/exp" "github.com/anhgelus/gokord/cmd" discordgo "github.com/nyttikord/gokord" + "github.com/nyttikord/gokord/channel" + "github.com/nyttikord/gokord/component" + "github.com/nyttikord/gokord/discord/types" + "github.com/nyttikord/gokord/emoji" + "github.com/nyttikord/gokord/interaction" ) const ( ConfigModify = "config_modify" + OpenConfig = "config" ) -func Config(s *discordgo.Session, i *discordgo.InteractionCreate, _ cmd.OptionMap, resp *cmd.ResponseBuilder) { +func ConfigResponse(i *discordgo.InteractionCreate) *interaction.Response { cfg := config.GetGuildConfig(i.GuildID) roles := "" l := len(cfg.XpRoles) - 1 @@ -47,40 +53,84 @@ func Config(s *discordgo.Session, i *discordgo.InteractionCreate, _ cmd.OptionMa } else { defaultChan = fmt.Sprintf("<#%s>", cfg.FallbackChannel) } - //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, - roles, - chans, - cfg.DaysXPRemains, - ) - err := resp.SetMessage(msg).IsEphemeral().Send() + content := []component.Component{ + &component.Container{ + Components: []component.Message{ + &component.TextDisplay{Content: "## Configuration"}, + &component.Separator{}, + &component.TextDisplay{Content: "**Salon par défaut**\n" + defaultChan}, + &component.TextDisplay{Content: "**Rôles de niveau**\n" + roles}, + &component.TextDisplay{Content: "**Salons ignorés**\n" + chans}, + &component.TextDisplay{ + Content: fmt.Sprintf("**Jours avant la réduction**\n%d jours", cfg.DaysXPRemains), + }, + &component.ActionsRow{ + Components: []component.Message{ + &component.SelectMenu{ + MenuType: types.SelectMenuString, + Placeholder: "Gestion des paramètres", + CustomID: ConfigModify, + Options: []component.SelectMenuOption{ + { + Label: "Salons par défaut", + Value: config.ModifyFallbackChannel, + Emoji: &emoji.Component{Name: "📣"}, + }, + { + Label: "Rôles de niveaux", + Value: config.ModifyXpRole, + Emoji: &emoji.Component{Name: "🏅"}, + }, + { + Label: "Salons ignorés", + Value: config.ModifyDisChannel, + Emoji: &emoji.Component{Name: "🫣"}, + }, + { + Label: "Temps avant la réduction d'expérience", + Value: config.ModifyTimeReduce, + Emoji: &emoji.Component{Name: "📉"}, + }, + }, + }, + }, + }, + }, + }, + } + return &interaction.Response{ + Type: types.InteractionResponseChannelMessageWithSource, + Data: &interaction.ResponseData{ + Components: content, + Flags: channel.MessageFlagsEphemeral | channel.MessageFlagsIsComponentsV2, + }, + } +} + +func ConfigCommand( + session *discordgo.Session, + i *discordgo.InteractionCreate, + _ cmd.OptionMap, + resp *cmd.ResponseBuilder, +) { + err := session.InteractionAPI().Respond(i.Interaction, ConfigResponse(i)) + + if err != nil { + session.LogError(err, "config/guild.go - Sending config") + } +} + +func ConfigMessageComponent( + session *discordgo.Session, + i *discordgo.InteractionCreate, + _ interaction.MessageComponentData, + resp *cmd.ResponseBuilder, +) { + response := ConfigResponse(i) + response.Type = types.InteractionResponseUpdateMessage + err := session.InteractionAPI().Respond(i.Interaction, response) + if err != nil { - s.LogError(err, "sending config") + session.LogError(err, "sending config") } } diff --git a/config/guild.go b/config/guild.go index 8384d5b..6310fa4 100644 --- a/config/guild.go +++ b/config/guild.go @@ -43,3 +43,12 @@ func (cfg *GuildConfig) FindXpRole(roleID string) (int, *XpRole) { } return 0, nil } + +func (cfg *GuildConfig) FindXpRoleID(ID uint) (int, *XpRole) { + for i, r := range cfg.XpRoles { + if r.ID == ID { + return i, &r + } + } + return -1, nil +} diff --git a/config/xp_role.go b/config/xp_role.go index 1a8fa8a..b35966f 100644 --- a/config/xp_role.go +++ b/config/xp_role.go @@ -2,10 +2,16 @@ package config import ( "fmt" + "slices" + "strconv" + "git.anhgelus.world/anhgelus/les-copaings-bot/exp" "github.com/anhgelus/gokord" "github.com/anhgelus/gokord/cmd" discordgo "github.com/nyttikord/gokord" + "github.com/nyttikord/gokord/channel" + "github.com/nyttikord/gokord/component" + "github.com/nyttikord/gokord/discord/types" "github.com/nyttikord/gokord/interaction" ) @@ -17,181 +23,446 @@ type XpRole struct { } 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" + ModifyXpRole = "xp_role" + XpRoleNew = "xp_role_add" + XpRoleAdd = "xp_role_add_level" + XpRoleEditPattern = `^xp_role_edit_(\d+)$` + XpRoleEditLevelPattern = `^xp_role_edit_level_(\d+)$` + XpRoleEditLevelStartPattern = `^xp_role_edit_level_start_(\d+)$` + XpRoleEditRolePattern = `^xp_role_edit_role_(\d+)$` + XpRoleDel = `^xp_role_del_(\d+)$` ) -var ( - configModifyMap = map[string]uint{} -) +func HandleXpRole( + session *discordgo.Session, + i *discordgo.InteractionCreate, + _ interaction.MessageComponentData, + resp *cmd.ResponseBuilder, +) { + cfg := GetGuildConfig(i.GuildID) + container := component.Container{ + Components: []component.Message{ + &component.TextDisplay{Content: "## Configuration / Rôles de niveaux"}, + &component.Separator{}, + }, + } + for _, r := range cfg.XpRoles { + container.Components = append(container.Components, &component.Section{ + Components: []component.Message{ + &component.TextDisplay{ + Content: fmt.Sprintf("<@&%s> - Niveau %d", r.RoleID, exp.Level(r.XP)), + }, + }, + Accessory: &component.Button{ + CustomID: fmt.Sprintf("xp_role_edit_%d", r.ID), + Style: component.ButtonStyleSecondary, + Label: "Modifier", + }, + }) + } + container.Components = append(container.Components, + &component.ActionsRow{ + Components: []component.Message{ + &component.Button{ + CustomID: XpRoleNew, + Style: component.ButtonStylePrimary, + Label: "Nouveau rôle", + }, + }, + }, + &component.Separator{}, + &component.ActionsRow{ + Components: []component.Message{ + &component.Button{CustomID: "config", Style: component.ButtonStyleSecondary, Label: "Retour"}, + }, + }, + ) + + response := &interaction.Response{ + Type: types.InteractionResponseUpdateMessage, + Data: &interaction.ResponseData{ + Components: []component.Component{&container}, + Flags: channel.MessageFlagsIsComponentsV2, + }, + } + err := session.InteractionAPI().Respond(i.Interaction, response) + if err != nil { + session.LogError(err, "Sending config") + } +} -func HandleModifyXpRole(_ *discordgo.Session, _ *discordgo.InteractionCreate, _ interaction.MessageComponentData, resp *cmd.ResponseBuilder) { - //err := resp.IsEphemeral(). - // SetMessage("Action à réaliser"). - // 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/xp_reduce.go - Sending config", err.Error()) - //} +func HandleXpRoleNew( + session *discordgo.Session, + i *discordgo.InteractionCreate, + data interaction.MessageComponentData, + resp *cmd.ResponseBuilder, +) { + one := 1 + response := &interaction.Response{ + Type: types.InteractionResponseModal, + Data: &interaction.ResponseData{ + Title: "Nouveau rôle de niveau", + CustomID: XpRoleAdd, + Components: []component.Component{ + &component.Label{ + Label: "Niveau", + Component: &component.TextInput{ + CustomID: "level", + Style: component.TextInputShort, + Placeholder: "5", + MinLength: 1, + MaxLength: 5, + Required: true, + }, + }, + &component.Label{ + Label: "Rôle", + Component: &component.SelectMenu{ + MenuType: types.SelectMenuRole, + CustomID: "role", + MinValues: &one, + MaxValues: one, + }, + }, + }, + }, + } + err := session.InteractionAPI().Respond(i.Interaction, response) + if err != nil { + session.LogError(err, "Sending modal to add") + } } -func HandleXpRoleAddEdit(_ *discordgo.Session, _ *discordgo.InteractionCreate, data interaction.MessageComponentData, resp *cmd.ResponseBuilder) { - //cID := XpRoleAddLevel - //if data.CustomID == XpRoleEdit { - // cID = XpRoleEditLevel - //} - //err := resp.IsModal(). - // SetTitle("Role"). - // SetCustomID(cID). - // SetComponents(component.New().ForModal().Add(component.NewActionRow().ForModal().Add( - // component.NewTextInput(cID, "Niveau", discordgo.TextInputShort). - // SetPlaceholder("5"). - // IsRequired(). - // SetMinLength(0). - // SetMaxLength(5), - // ))). - // Send() - //if err != nil { - // logger.Alert("config/xp_reduce.go - Sending modal to add/edit", err.Error()) - //} +func HandleXpRoleEdit( + session *discordgo.Session, + i *discordgo.InteractionCreate, + data interaction.MessageComponentData, + parameters []string, resp *cmd.ResponseBuilder, +) { + config := GetGuildConfig(i.GuildID) + id, err := getRoleLevelID(parameters) + if err != nil { + session.LogError(err, "Reading dynamic CustomID") + return + } + roleIndex := slices.IndexFunc(config.XpRoles, func(role XpRole) bool { return role.ID == id }) + if roleIndex == -1 { + return + } + role := config.XpRoles[roleIndex] + + roleSelect := &component.SelectMenu{ + MenuType: types.SelectMenuRole, + CustomID: fmt.Sprintf("xp_role_edit_role_%d", id), + DefaultValues: []component.SelectMenuDefaultValue{ + {ID: role.RoleID, Type: types.SelectMenuDefaultValueRole}, + }, + } + + container := &component.Container{ + Components: []component.Message{ + &component.TextDisplay{Content: "## Configuration / Rôles de niveaux"}, + &component.Separator{}, + &component.Section{ + Components: []component.Message{ + &component.TextDisplay{Content: fmt.Sprintf("Niveau **%d**", exp.Level(role.XP))}, + }, + Accessory: &component.Button{ + CustomID: fmt.Sprintf("xp_role_edit_level_start_%d", id), + Style: component.ButtonStyleSecondary, + Label: "Modifier", + }, + }, + &component.ActionsRow{Components: []component.Message{roleSelect}}, + &component.ActionsRow{Components: []component.Message{ + &component.Button{CustomID: fmt.Sprintf("xp_role_del_%d", id), Style: component.ButtonStyleDanger, Label: "Supprimer"}, + }}, + &component.Separator{}, + &component.ActionsRow{Components: []component.Message{ + &component.Button{Label: "Retour", CustomID: ModifyXpRole, Style: component.ButtonStyleSecondary}, + }}, + }, + } + + response := &interaction.Response{ + Type: types.InteractionResponseUpdateMessage, + Data: &interaction.ResponseData{ + Components: []component.Component{container}, + Flags: channel.MessageFlagsIsComponentsV2, + }, + } + + err = session.InteractionAPI().Respond(i.Interaction, response) + if err != nil { + session.LogError(err, "Sending xp_role config") + } } -func HandleXpRoleAddRole(s *discordgo.Session, i *discordgo.InteractionCreate, data interaction.MessageComponentData, resp *cmd.ResponseBuilder) { - resp.IsEphemeral() +func HandleXpRoleEditRole( + session *discordgo.Session, + i *discordgo.InteractionCreate, + data interaction.MessageComponentData, + parameters []string, resp *cmd.ResponseBuilder, +) { + id, err := getRoleLevelID(parameters) + if err != nil { + session.LogError(err, "Reading dynamic CustomID") + return + } + role := data.Values[0] 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() + for _, xpRole := range cfg.XpRoles { + if xpRole.RoleID == role { + err = session.InteractionAPI().Respond(i.Interaction, &interaction.Response{ + Type: types.InteractionResponseChannelMessageWithSource, + Data: &interaction.ResponseData{ + Flags: channel.MessageFlagsEphemeral, + AllowedMentions: &channel.MessageAllowedMentions{}, + Content: fmt.Sprintf("Un autre niveau avec le rôle <@&%s> est déjà existant.", role), + }, + }) if err != nil { - s.LogError(err, "sending role already in config") + session.LogError(err, "Sending unable to Already existing role message") } return } } - cfg.XpRoles = append(cfg.XpRoles, XpRole{ - XP: configModifyMap[getKeyConfigRole(i)], - RoleID: roleId, - }) - err := cfg.Save() - if err != nil { - s.LogError(err, "saving config for role %s in %s", roleId, i.GuildID) + index, xprole := cfg.FindXpRoleID(id) + if index == 0 { + err = session.InteractionAPI().Respond(i.Interaction, &interaction.Response{ + Type: types.InteractionResponseChannelMessageWithSource, + Data: &interaction.ResponseData{ + Flags: channel.MessageFlagsEphemeral, + Content: "Impossible de modifier le rôle. Peut-être a-t-il été supprimé ?", + }, + }) + if err != nil { + session.LogError(err, "Sending unable to get role message") + } return } - if err = resp.SetMessage("Rôle ajouté.").Send(); err != nil { - s.LogError(err, "Sending role saved") + xprole.RoleID = role + err = gokord.DB.Save(xprole).Error + 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) } -func HandleXpRoleEditRole(s *discordgo.Session, i *discordgo.InteractionCreate, data interaction.MessageComponentData, resp *cmd.ResponseBuilder) { - resp.IsEphemeral() +func HandleXpRoleEditLevelStart( + session *discordgo.Session, + i *discordgo.InteractionCreate, + data interaction.MessageComponentData, + parameters []string, + resp *cmd.ResponseBuilder, +) { + id, err := getRoleLevelID(parameters) + if err != nil { + session.LogError(err, "Reading dynamic CustomID") + return + } 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() + _, role := cfg.FindXpRoleID(id) + if role == nil { + err = session.InteractionAPI().Respond(i.Interaction, &interaction.Response{ + Type: types.InteractionResponseChannelMessageWithSource, + Data: &interaction.ResponseData{ + Flags: channel.MessageFlagsEphemeral, + Content: "Impossible de trouver le rôle. Peut-être a-t-il été supprimé ?", + }, + }) if err != nil { - s.LogError(err, "role not found") + session.LogError(err, "Sending Unable to get role message") } return } - r.XP = configModifyMap[getKeyConfigRole(i)] - err := gokord.DB.Save(r).Error + response := &interaction.Response{ + Type: types.InteractionResponseModal, + Data: &interaction.ResponseData{ + Title: "Modification du niveau lié au rôle", + CustomID: fmt.Sprintf("xp_role_edit_level_%d", id), + Components: []component.Component{ + &component.Label{ + Label: "Nouveau niveau", + Component: &component.TextInput{ + Style: component.TextInputShort, + Required: true, + CustomID: "level", + MinLength: 1, + MaxLength: 5, + Placeholder: "5", + Value: strconv.FormatUint(uint64(exp.Level(role.XP)), 10), + }, + }, + }, + }, + } + err = session.InteractionAPI().Respond(i.Interaction, response) + if err != nil { + session.LogError(err, "Sending Edit level modal") + } +} + +func HandleXpRoleEditLevel( + session *discordgo.Session, + i *discordgo.InteractionCreate, + data interaction.ModalSubmitData, + parameters []string, + resp *cmd.ResponseBuilder, +) { + id, err := getRoleLevelID(parameters) if err != nil { - s.LogError(err, "saving config for role %s in %s", roleId, i.GuildID) + session.LogError(err, "Reading dynamic CustomID") return } - if err = resp.SetMessage("Rôle modifié.").Send(); err != nil { - s.LogError(err, "sending role saved") + + fmt.Printf("Alors?... %#v", data.Components) + levelInput := data.Components[0].(*component.Label).Component.(*component.TextInput) + level, err := strconv.Atoi(levelInput.Value) + if err != nil || level < 0 { + err = resp.IsEphemeral(). + SetMessage( + fmt.Sprintf("Le niveau doit être un nombre entier positif.\n-# Trouvé : %s", levelInput.Value), + ). + Send() + if err != nil { + session.LogError(err, "Sending bad number warning message") + } + return } -} + xp := exp.LevelXP(uint(level)) -func HandleXpRoleDel(_ *discordgo.Session, _ *discordgo.InteractionCreate, _ interaction.MessageComponentData, 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/xp_reduce.go - Sending response to del", err.Error()) - //} + cfg := GetGuildConfig(i.GuildID) + for _, xpRole := range cfg.XpRoles { + if xpRole.XP == xp { + err = session.InteractionAPI().Respond(i.Interaction, &interaction.Response{ + Type: types.InteractionResponseChannelMessageWithSource, + Data: &interaction.ResponseData{ + Flags: channel.MessageFlagsEphemeral, + Content: fmt.Sprintf("Un autre rôle est déjà lié au niveau %d.", level), + }, + }) + if err != nil { + session.LogError(err, "Sending unable to Already existing level message") + } + return + } + } + index, xprole := cfg.FindXpRoleID(id) + if index == -1 { + err = session.InteractionAPI().Respond(i.Interaction, &interaction.Response{ + Type: types.InteractionResponseChannelMessageWithSource, + Data: &interaction.ResponseData{ + Flags: channel.MessageFlagsEphemeral, + Content: "Impossible de modifier le rôle. Peut-être a-t-il été supprimé ?", + }, + }) + if err != nil { + session.LogError(err, "Sending unable to modify role message") + } + return + } + xprole.XP = xp + err = gokord.DB.Save(xprole).Error + 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) } -func HandleXpRoleDelRole(s *discordgo.Session, i *discordgo.InteractionCreate, data interaction.MessageComponentData, resp *cmd.ResponseBuilder) { - resp.IsEphemeral() +func HandleXpRoleDel( + session *discordgo.Session, + i *discordgo.InteractionCreate, + _ interaction.MessageComponentData, + dynamic_values []string, + resp *cmd.ResponseBuilder, +) { + id, err := getRoleLevelID(dynamic_values) + if err != nil { + session.LogError(err, "reading dynamic CustomID") + return + } 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() + _, role := cfg.FindXpRoleID(id) + if role == nil { + err := session.InteractionAPI().Respond(i.Interaction, &interaction.Response{ + Type: types.InteractionResponseChannelMessageWithSource, + Data: &interaction.ResponseData{ + Content: "Rôle introuvable. Peut-être a-t-il déjà été supprimé ?", + Flags: channel.MessageFlagsEphemeral, + }, + }) if err != nil { - s.LogError(err, "sending role not found") + session.LogError(err, "Sending role not found message") } return } - err := gokord.DB.Delete(r).Error + err = gokord.DB.Delete(role).Error if err != nil { - s.LogError(err, "saving config for role %s in %s", roleId, i.GuildID) + session.LogError(err, "Deleting entry guild_id %s, id %d, type del", i.GuildID, id) + } + + HandleXpRole(session, i, interaction.MessageComponentData{}, resp) +} + +func HandleXpRoleAdd( + session *discordgo.Session, + i *discordgo.InteractionCreate, + data interaction.ModalSubmitData, + resp *cmd.ResponseBuilder, +) { + levelInput := data.Components[0].(*component.Label).Component.(*component.TextInput) + + in, err := strconv.Atoi(levelInput.Value) + if err != nil || in < 0 { + err = resp.IsEphemeral(). + SetMessage( + fmt.Sprintf("Le niveau doit être un nombre entier positif.\n-# Trouvé : %s", levelInput.Value), + ). + Send() + if err != nil { + session.LogError(err, "sending bad number warning message") + } return } - if err = resp.SetMessage("Rôle supprimé.").Send(); err != nil { - s.LogError(err, "sending role deleted") + xp := exp.LevelXP(uint(in)) + + roleId := data.Components[1].(*component.Label).Component.(*component.SelectMenu).Values[0] + + cfg := GetGuildConfig(i.GuildID) + for _, r := range cfg.XpRoles { + if r.RoleID == roleId { + err := resp.IsEphemeral().SetMessage(fmt.Sprintf("Le rôle <@&%s> est déjà lié au niveau %d.", r.RoleID, exp.Level(r.XP))).Send() + if err != nil { + session.LogError(err, "sending role already in config") + } + return + } else if r.XP == xp { + err := resp.IsEphemeral().SetMessage(fmt.Sprintf("Le niveau %d est déjà lié au rôle <@&%s>.", in, r.RoleID)).Send() + if err != nil { + session.LogError(err, "sending role already in config") + } + return + } + } + cfg.XpRoles = append(cfg.XpRoles, XpRole{ + XP: xp, + RoleID: roleId, + }) + err = cfg.Save() + if err != nil { + session.LogError(err, "saving config for role %s in %s", roleId, i.GuildID) + return } -} -func HandleXpRoleLevel(_ *discordgo.Session, i *discordgo.InteractionCreate, data interaction.ModalSubmitData, 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. - // 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] = exp.LevelXP(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 = XpRoleEditRole - // resp.SetMessage("Rôle à modifier") - //} - // - //err = resp. - // SetComponents(component.New().Add(component.NewActionRow().Add(component.NewRoleSelect(cID)))). - // Send() - //if err != nil { - // logger.Alert("config/xp_reduce.go - Sending response to add/edit", err.Error()) - //} + HandleXpRole(session, i, interaction.MessageComponentData{}, resp) } -func getKeyConfigRole(i *discordgo.InteractionCreate) string { - return fmt.Sprintf("r:%s:%s", i.GuildID, i.Member.User.ID) +func getRoleLevelID(dynamic []string) (uint, error) { + id64, err := strconv.ParseUint(dynamic[0], 10, 0) + if err != nil { + return 0, err + } + + return uint(id64), nil } @@ -9,7 +9,6 @@ import ( "git.anhgelus.world/anhgelus/les-copaings-bot/exp" "git.anhgelus.world/anhgelus/les-copaings-bot/user" "github.com/anhgelus/gokord" - "github.com/anhgelus/gokord/logger" discordgo "github.com/nyttikord/gokord" ) @@ -39,11 +38,7 @@ func OnMessage(s *discordgo.Session, m *discordgo.MessageCreate) { xp := min(exp.MessageXP(uint(len(trimmed)), exp.CalcDiversity(trimmed)), MaxXpPerMessage) c.AddXP(s, m.Member, xp, func(_ uint, _ uint) { if err := s.ChannelAPI().MessageReactionAdd(m.ChannelID, m.Message.ID, "⬆"); err != nil { - logger.Alert( - "events.go - add reaction for new level", err.Error(), - "channel id", m.ChannelID, - "message id", m.Message.ID, - ) + s.LogError(err, "add reaction for new level channel id %s, message id %s", m.ChannelID, m.Message.ID) } }) } @@ -70,8 +65,8 @@ func genMapKey(guildID string, userID string) string { return fmt.Sprintf("%s:%s", guildID, userID) } -func onConnection(_ *discordgo.Session, e *discordgo.VoiceStateUpdate) { - logger.Debug("User connected", "username", e.Member.DisplayName()) +func onConnection(s *discordgo.Session, e *discordgo.VoiceStateUpdate) { + s.LogDebug("User connected username %s", e.Member.DisplayName()) connectedSince[genMapKey(e.GuildID, e.UserID)] = time.Now().Unix() } @@ -81,25 +76,19 @@ func onDisconnect(s *discordgo.Session, e *discordgo.VoiceStateUpdate) { // check the validity of user con, ok := connectedSince[genMapKey(e.GuildID, e.UserID)] if !ok || con == NotConnected { - logger.Warn(fmt.Sprintf( - "User %s diconnect from a vocal but was registered as not connected", e.Member.DisplayName(), - )) + s.LogWarn("User %s disconnect from a vocal but was registered as not connected", e.Member.DisplayName()) return } timeInVocal := now - con - logger.Debug("User disconnected", "username", e.Member.DisplayName(), "time in vocal", timeInVocal) + s.LogDebug("User disconnected username %s, time in vocal %d", e.Member.DisplayName(), timeInVocal) connectedSince[genMapKey(e.GuildID, e.UserID)] = NotConnected // add exp if timeInVocal < 0 { - logger.Alert( - "events.go - Calculating time spent in vocal", "the time is negative", - "discord_id", e.UserID, - "guild_id", e.GuildID, - ) + s.LogWarn("Time spent in vocal negative discord_id %s, guild_id %s", e.UserID, e.GuildID) return } if timeInVocal > MaxTimeInVocal { - logger.Warn(fmt.Sprintf("User %s spent more than 6 hours in vocal", e.Member.DisplayName())) + s.LogWarn("User %s spent more than 6 hours in vocal", e.Member.DisplayName()) timeInVocal = MaxTimeInVocal } e.Member.GuildID = e.GuildID @@ -112,13 +101,13 @@ func onDisconnect(s *discordgo.Session, e *discordgo.VoiceStateUpdate) { "%s est maintenant niveau %d", e.Member.Mention(), newLevel, )) if err != nil { - logger.Alert("events.go - Sending new level in fallback channel", err.Error()) + s.LogError(err, "Sending new level in fallback channel") } }) } -func OnLeave(_ *discordgo.Session, e *discordgo.GuildMemberRemove) { - logger.Debug("Leave event", "user_id", e.User.ID) +func OnLeave(s *discordgo.Session, e *discordgo.GuildMemberRemove) { + s.LogDebug("Leave event user_id %s", e.User.ID) if e.User.Bot { return } @@ -128,17 +117,9 @@ func OnLeave(_ *discordgo.Session, e *discordgo.GuildMemberRemove) { Delete(&user.CopaingXP{}). Error if err != nil { - logger.Alert( - "events.go - deleting user xp from db", err.Error(), - "user_id", e.User.ID, - "guild_id", e.GuildID, - ) + s.LogError(err, "Deleting user xp from db user_id %s, guild_id %s", e.User.ID, e.GuildID) } if err = c.Delete(); err != nil { - logger.Alert( - "events.go - deleting user from db", err.Error(), - "user_id", e.User.ID, - "guild_id", e.GuildID, - ) + s.LogError(err, "Deleting user from DB user_id %s, guild_id %s", e.User.ID, e.GuildID) } } @@ -7,7 +7,7 @@ toolchain go1.24.6 require ( github.com/anhgelus/gokord v0.11.1-0.20250913175430-bf95758b4d3b github.com/joho/godotenv v1.5.1 - github.com/nyttikord/gokord v0.30.1-0.20250913173431-8e43619c03fa + github.com/nyttikord/gokord v0.30.1-0.20250914224716-68c5eb8c8ab2 github.com/pelletier/go-toml/v2 v2.2.4 gorm.io/driver/postgres v1.6.0 gorm.io/gorm v1.31.0 @@ -82,6 +82,8 @@ github.com/nyttikord/gokord v0.30.1-0.20250913143152-425cd430dee0 h1:bvSFyK1JXTu github.com/nyttikord/gokord v0.30.1-0.20250913143152-425cd430dee0/go.mod h1:Lhk268VlZ1W6Pb3kYnlU9bIuTCioaumedjHdtw1sxck= github.com/nyttikord/gokord v0.30.1-0.20250913173431-8e43619c03fa h1:P9zaVyRF0bDnmhUg6PaNfmyUqDZ+EvHpBnCdH0/0T3s= github.com/nyttikord/gokord v0.30.1-0.20250913173431-8e43619c03fa/go.mod h1:Lhk268VlZ1W6Pb3kYnlU9bIuTCioaumedjHdtw1sxck= +github.com/nyttikord/gokord v0.30.1-0.20250914224716-68c5eb8c8ab2 h1:DHoH/b1SnmJVjDQDd1ZV2Ri+NIXOyrsGgmoRFG1rro8= +github.com/nyttikord/gokord v0.30.1-0.20250914224716-68c5eb8c8ab2/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= @@ -2,9 +2,11 @@ package main import ( _ "embed" + "encoding/json" "errors" "flag" "os" + "regexp" "time" "git.anhgelus.world/anhgelus/les-copaings-bot/commands" @@ -63,6 +65,61 @@ func init() { } +func handleDynamicMessageComponent( + b *gokord.Bot, + handler func( + *discordgo.Session, + *discordgo.InteractionCreate, + interaction.MessageComponentData, + []string, *cmd.ResponseBuilder, + ), + pattern string, +) { + compiledPattern := regexp.MustCompile(pattern) + b.AddHandler(func(s *discordgo.Session, i *discordgo.InteractionCreate) { + if i.Type != types.InteractionMessageComponent { + return + } + + data := i.MessageComponentData() + parameters := compiledPattern.FindStringSubmatch(data.CustomID) + if parameters == nil { + return + } + parameters = parameters[1:] + handler(s, i, data, parameters, cmd.NewResponseBuilder(s, i)) + }) +} + +func handleDynamicModalComponent( + b *gokord.Bot, + handler func( + *discordgo.Session, + *discordgo.InteractionCreate, + interaction.ModalSubmitData, + []string, + *cmd.ResponseBuilder, + ), + pattern string, +) { + compiledPattern := regexp.MustCompile(pattern) + b.AddHandler(func(s *discordgo.Session, i *discordgo.InteractionCreate) { + if i.Type != types.InteractionModalSubmit { + return + } + + data := i.ModalSubmitData() + content, _ := json.Marshal(data) + s.LogDebug(string(content)) + parameters := compiledPattern.FindStringSubmatch(data.CustomID) + if parameters == nil { + return + } + parameters = parameters[1:] + handler(s, i, data, parameters, cmd.NewResponseBuilder(s, i)) + }) +} + func main() { flag.Parse() gokord.UseRedis = false @@ -88,7 +145,7 @@ func main() { configCmd := cmd.New("config", "Modifie la config"). SetPermission(&adm). - SetHandler(commands.Config) + SetHandler(commands.ConfigCommand) topCmd := cmd.New("top", "Copaings les plus actifs"). SetHandler(commands.Top) @@ -184,7 +241,7 @@ func main() { } switch data.Values[0] { case config.ModifyXpRole: - config.HandleModifyXpRole(s, i, data, resp) + config.HandleXpRole(s, i, data, resp) case config.ModifyFallbackChannel: config.HandleModifyFallbackChannel(s, i, data, resp) case config.ModifyDisChannel: @@ -196,15 +253,16 @@ func main() { return } }, commands.ConfigModify) + bot.HandleMessageComponent(commands.ConfigMessageComponent, commands.OpenConfig) // xp role related - bot.HandleMessageComponent(config.HandleXpRoleAddEdit, config.XpRoleAdd) - bot.HandleMessageComponent(config.HandleXpRoleAddEdit, config.XpRoleEdit) - bot.HandleMessageComponent(config.HandleXpRoleAddRole, config.XpRoleAddRole) - bot.HandleMessageComponent(config.HandleXpRoleEditRole, config.XpRoleEditRole) - bot.HandleMessageComponent(config.HandleXpRoleDel, config.XpRoleDel) - bot.HandleMessageComponent(config.HandleXpRoleDelRole, config.XpRoleDelRole) - bot.HandleModal(config.HandleXpRoleLevel, config.XpRoleAddLevel) - bot.HandleModal(config.HandleXpRoleLevel, config.XpRoleEditLevel) + bot.HandleMessageComponent(config.HandleXpRole, config.ModifyXpRole) + bot.HandleMessageComponent(config.HandleXpRoleNew, config.XpRoleNew) + bot.HandleModal(config.HandleXpRoleAdd, config.XpRoleAdd) + handleDynamicMessageComponent(&bot, config.HandleXpRoleEdit, config.XpRoleEditPattern) + handleDynamicMessageComponent(&bot, config.HandleXpRoleEditRole, config.XpRoleEditRolePattern) + handleDynamicMessageComponent(&bot, config.HandleXpRoleEditLevelStart, config.XpRoleEditLevelStartPattern) + handleDynamicModalComponent(&bot, config.HandleXpRoleEditLevel, config.XpRoleEditLevelPattern) + handleDynamicMessageComponent(&bot, config.HandleXpRoleDel, config.XpRoleDel) // channel related bot.HandleMessageComponent(config.HandleFallbackChannelSet, config.FallbackChannelSet) bot.HandleMessageComponent(config.HandleDisChannel, config.DisChannelAdd) |