feat(command): use gokord new handle for config

commands/config.go

@@ -123,18 +123,7 @@ func Config(_ *discordgo.Session, i *discordgo.InteractionCreate, _ cmd.OptionMa
 	}
 }
 
-func ConfigXP(s *discordgo.Session, i *discordgo.InteractionCreate) {
+func ConfigModifyXPRole(_ *discordgo.Session, _ *discordgo.InteractionCreate, _ discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) {
-	if i.Type != discordgo.InteractionMessageComponent {
-		return
-	}
-
-	cfg := config.GetGuildConfig(i.GuildID)
-
-	resp := cmd.NewResponseBuilder(s, i)
-
-	msgData := i.MessageComponentData()
-	switch msgData.CustomID {
-	case ConfigModifyXpRole:
 	err := resp.IsEphemeral().
 		SetMessage("Action à réaliser").
 		SetComponents(component.New().Add(component.NewActionRow().Add(
@@ -158,9 +147,11 @@ func ConfigXP(s *discordgo.Session, i *discordgo.InteractionCreate) {
 	if err != nil {
 		logger.Alert("config/guild.go - Sending config", err.Error())
 	}
-	case XpRoleAdd, XpRoleEdit:
+}
+
+func ConfigXPRoleAddEdit(_ *discordgo.Session, _ *discordgo.InteractionCreate, data discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) {
 	cID := XpRoleAddLevel
-		if msgData.CustomID == XpRoleEdit {
+	if data.CustomID == XpRoleEdit {
 		cID = XpRoleEditLevel
 	}
 	err := resp.IsModal().
@@ -174,10 +165,13 @@ func ConfigXP(s *discordgo.Session, i *discordgo.InteractionCreate) {
 		))).
 		Send()
 	if err != nil {
-			logger.Alert("config/guild.go - Sending modal to add", err.Error())
+		logger.Alert("config/guild.go - Sending modal to add/edit", err.Error())
 	}
-	case XpRoleAddRole:
+}
-		roleId := msgData.Values[0]
+
+func ConfigXPRoleAddRole(_ *discordgo.Session, i *discordgo.InteractionCreate, data discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) {
+	cfg := config.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()
@@ -204,8 +198,11 @@ func ConfigXP(s *discordgo.Session, i *discordgo.InteractionCreate) {
 	if err = resp.IsEphemeral().SetMessage("Rôle ajouté.").Send(); err != nil {
 		logger.Alert("commands/config.go - Sending success", err.Error())
 	}
-	case XpRoleEditRole:
+}
-		roleId := msgData.Values[0]
+
+func ConfigXPRoleEditRole(_ *discordgo.Session, i *discordgo.InteractionCreate, data discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) {
+	cfg := config.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()
@@ -228,7 +225,9 @@ func ConfigXP(s *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())
 	}
-	case XpRoleDel:
+}
+
+func ConfigXPRoleDel(_ *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)))).
@@ -236,13 +235,16 @@ func ConfigXP(s *discordgo.Session, i *discordgo.InteractionCreate) {
 	if err != nil {
 		logger.Alert("config/guild.go - Sending response to del", err.Error())
 	}
-	case XpRoleDelRole:
+}
-		roleId := msgData.Values[0]
+
+func ConfigXPRoleDelRole(_ *discordgo.Session, i *discordgo.InteractionCreate, data discordgo.MessageComponentInteractionData, resp *cmd.ResponseBuilder) {
+	cfg := config.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 (del)", err.Error())
+			logger.Alert("commands/config.go - Sending role not found (del)", err.Error())
 		}
 		return
 	}
@@ -259,28 +261,10 @@ func ConfigXP(s *discordgo.Session, i *discordgo.InteractionCreate) {
 	if err = resp.IsEphemeral().SetMessage("Rôle supprimé.").Send(); err != nil {
 		logger.Alert("commands/config.go - Sending success", err.Error())
 	}
-	default:
-		err := resp.SetMessage("Le type d'action n'est pas valide.").Send()
-		if err != nil {
-			logger.Alert("commands/config.go - Invalid action type", err.Error())
-		}
-		return
-	}
 }
 
-func ConfigXPModal(s *discordgo.Session, i *discordgo.InteractionCreate) {
+func ConfigXPRoleLevel(_ *discordgo.Session, i *discordgo.InteractionCreate, data discordgo.ModalSubmitInteractionData, resp *cmd.ResponseBuilder) {
-	if i.Type != discordgo.InteractionModalSubmit {
+	input := data.Components[0].(*discordgo.ActionsRow).Components[0].(*discordgo.TextInput)
-		return
-	}
-	resp := cmd.NewResponseBuilder(s, i)
-
-	modalData := i.ModalSubmitData()
-
-	if modalData.CustomID != XpRoleAddLevel && modalData.CustomID != XpRoleEditLevel {
-		return
-	}
-
-	input := modalData.Components[0].(*discordgo.ActionsRow).Components[0].(*discordgo.TextInput)
 
 	k := getKeyConfigRole(i)
 	in, err := strconv.Atoi(input.Value)
@@ -300,7 +284,7 @@ func ConfigXPModal(s *discordgo.Session, i *discordgo.InteractionCreate) {
 
 	cID := XpRoleAddRole
 	resp.SetMessage("Rôle à ajouter")
-	if modalData.CustomID == XpRoleEditLevel {
+	if data.CustomID == XpRoleEditLevel {
 		cID = XpRoleEditLevel
 		resp.SetMessage("Rôle à modifier")
 	}

main.go

@@ -116,31 +116,37 @@ func main() {
 			resetUserCmd,
 			creditsCmd,
 		},
-		AfterInit:   afterInit,
+		AfterInit: func(dg *discordgo.Session) {
+			stopPeriodicReducer = gokord.NewTimer(24*time.Hour, func(stop chan<- interface{}) {
+				user.PeriodicReducer(dg)
+			})
+		},
 		Innovations: innovations,
 		Version:     &Version,
 		Intents: discordgo.IntentsAllWithoutPrivileged |
 			discordgo.IntentsMessageContent |
 			discordgo.IntentGuildMembers,
 	}
+
+	// interaction: /config
+	bot.HandleMessageComponent(commands.ConfigModifyXPRole, commands.ConfigModifyXpRole)
+	bot.HandleMessageComponent(commands.ConfigXPRoleAddEdit, commands.XpRoleAdd)
+	bot.HandleMessageComponent(commands.ConfigXPRoleAddEdit, commands.XpRoleEdit)
+	bot.HandleMessageComponent(commands.ConfigXPRoleAddRole, commands.XpRoleAddRole)
+	bot.HandleMessageComponent(commands.ConfigXPRoleEditRole, commands.XpRoleEditRole)
+	bot.HandleMessageComponent(commands.ConfigXPRoleDel, commands.XpRoleDel)
+	bot.HandleMessageComponent(commands.ConfigXPRoleDelRole, commands.XpRoleDelRole)
+	bot.HandleModal(commands.ConfigXPRoleLevel, commands.XpRoleAddLevel)
+	bot.HandleModal(commands.ConfigXPRoleLevel, commands.XpRoleEditLevel)
+
+	// xp handlers
+	bot.AddHandler(OnMessage)
+	bot.AddHandler(OnVoiceUpdate)
+	bot.AddHandler(OnLeave)
+
 	bot.Start()
 
 	if stopPeriodicReducer != nil {
 		stopPeriodicReducer <- true
 	}
 }
-
-func afterInit(dg *discordgo.Session) {
-	// handlers
-	dg.AddHandler(OnMessage)
-	dg.AddHandler(OnVoiceUpdate)
-	dg.AddHandler(OnLeave)
-
-	stopPeriodicReducer = gokord.NewTimer(24*time.Hour, func(stop chan<- interface{}) {
-		user.PeriodicReducer(dg)
-	})
-
-	//interaction: /config
-	dg.AddHandler(commands.ConfigXP)
-	dg.AddHandler(commands.ConfigXPModal)
-}