fix automod buttons

Author: topi314

dbot/commands/report.go

@@ -103,12 +103,12 @@ func CreateReport(b *dbot.Bot, settings model.GuildSetting, reportID int32, cont
 				discord.ButtonComponent{
 					Style:    discord.ButtonStyleSuccess,
 					Label:    "Confirm",
-					CustomID: fmt.Sprintf("cmd:report:confirm:%d", reportID),
+					CustomID: fmt.Sprintf("handler:report-confirm:%d", reportID),
 				},
 				discord.ButtonComponent{
 					Style:    discord.ButtonStyleDanger,
 					Label:    "Delete",
-					CustomID: fmt.Sprintf("cmd:report:delete:%d", reportID),
+					CustomID: fmt.Sprintf("handler:report-delete:%d", reportID),
 				},
 			},
 		},

dbot/commands/report_components.go

@@ -18,36 +18,36 @@ import (
 
 func ReportAction(b *dbot.Bot) handler.Component {
 	return handler.Component{
-		Name:    "action",
+		Name:    "report-action",
 		Handler: reportActionHandler(b),
 	}
 }
 
 func ReportConfirm(b *dbot.Bot) handler.Component {
 	return handler.Component{
-		Name:    "confirm",
+		Name:    "report-confirm",
 		Handler: reportConfirmHandler(b),
 	}
 }
 
 func ReportDelete(b *dbot.Bot) handler.Component {
 	return handler.Component{
-		Name:    "delete",
+		Name:    "report-delete",
 		Handler: reportDeleteHandler(b),
 	}
 }
 
 func ReportActionConfirm(b *dbot.Bot) handler.Modal {
 	return handler.Modal{
-		Name:    "action-confirm",
+		Name:    "report-action-confirm",
 		Handler: reportActionConfirmHandler(b),
 	}
 }
 
 func reportConfirmHandler(b *dbot.Bot) handler.ComponentHandler {
 	return func(e *events.ComponentInteractionCreate) error {
 		args := strings.Split(e.Data.CustomID(), ":")
-		reportID, err := parseReportID(args[0])
+		reportID, err := parseReportID(args[2])
 		if err != nil {
 			return err
 		}
@@ -131,7 +131,7 @@ func reportConfirmHandler(b *dbot.Bot) handler.ComponentHandler {
 			Components: &[]discord.ContainerComponent{
 				discord.ActionRowComponent{
 					discord.SelectMenuComponent{
-						CustomID:    fmt.Sprintf("cmd:report:action:%d", reportID),
+						CustomID:    fmt.Sprintf("handler:report-action:%d", reportID),
 						Placeholder: "Select an action",
 						MinValues:   json.NewPtr(1),
 						MaxValues:   1,
@@ -146,7 +146,7 @@ func reportConfirmHandler(b *dbot.Bot) handler.ComponentHandler {
 func reportDeleteHandler(b *dbot.Bot) handler.ComponentHandler {
 	return func(e *events.ComponentInteractionCreate) error {
 		args := strings.Split(e.Data.CustomID(), ":")
-		reportID, err := parseReportID(args[0])
+		reportID, err := parseReportID(args[2])
 		if err != nil {
 			return err
 		}
@@ -181,7 +181,7 @@ func reportActionHandler(b *dbot.Bot) handler.ComponentHandler {
 	return func(e *events.ComponentInteractionCreate) error {
 
 		args := strings.Split(e.Data.CustomID(), ":")
-		reportID, err := parseReportID(args[0])
+		reportID, err := parseReportID(args[2])
 		if err != nil {
 			return err
 		}
@@ -252,7 +252,7 @@ func reportActionHandler(b *dbot.Bot) handler.ComponentHandler {
 
 		case "timeout":
 			return e.CreateModal(discord.ModalCreate{
-				CustomID: fmt.Sprintf("cmd:report:action-confirm:timeout:%s", report.UserID),
+				CustomID: fmt.Sprintf("handler:report-action-confirm:timeout:%s", report.UserID),
 				Title:    "Timeout User",
 				Components: []discord.ContainerComponent{
 					discord.ActionRowComponent{
@@ -281,7 +281,7 @@ func reportActionHandler(b *dbot.Bot) handler.ComponentHandler {
 
 		case "kick":
 			return e.CreateModal(discord.ModalCreate{
-				CustomID: fmt.Sprintf("cmd:report:action-confirm:kick:%s", report.UserID),
+				CustomID: fmt.Sprintf("handler:report-action-confirm:kick:%s", report.UserID),
 				Title:    "Kick User",
 				Components: []discord.ContainerComponent{
 					discord.ActionRowComponent{
@@ -299,7 +299,7 @@ func reportActionHandler(b *dbot.Bot) handler.ComponentHandler {
 
 		case "ban":
 			return e.CreateModal(discord.ModalCreate{
-				CustomID: fmt.Sprintf("cmd:report:action-confirm:ban:%s", report.UserID),
+				CustomID: fmt.Sprintf("handler:report-action-confirm:ban:%s", report.UserID),
 				Title:    "Ban User",
 				Components: []discord.ContainerComponent{
 					discord.ActionRowComponent{
@@ -341,11 +341,11 @@ func reportActionHandler(b *dbot.Bot) handler.ComponentHandler {
 func reportActionConfirmHandler(b *dbot.Bot) handler.ModalHandler {
 	return func(e *events.ModalSubmitInteractionCreate) error {
 		args := strings.Split(e.Data.CustomID, ":")
-		userID := snowflake.MustParse(args[1])
+		userID := snowflake.MustParse(args[3])
 		reason := e.Data.Text("reason")
 
 		var content string
-		switch args[0] {
+		switch args[2] {
 		case "timeout":
 			until := time.Now()
 			duration, err := time.ParseDuration(e.Data.Text("duration"))

dbot/commands/settings.go

@@ -28,8 +28,8 @@ func Settings(b *dbot.Bot) handler.Command {
 							Description: "Disables moderation",
 						},
 						{
-							Name:        "log-channel",
-							Description: "Set the channel to log moderation actions",
+							Name:        "enable",
+							Description: "Enables & sets the channel to log moderation actions to",
 							Options: []discord.ApplicationCommandOption{
 								discord.ApplicationCommandOptionChannel{
 									Name:        "channel",
@@ -44,8 +44,8 @@ func Settings(b *dbot.Bot) handler.Command {
 			DefaultMemberPermissions: json.NewOptional(discord.PermissionManageServer),
 		},
 		CommandHandlers: map[string]handler.CommandHandler{
-			"moderation/disable":     settingsModerationDisableHandler(b),
-			"moderation/log-channel": settingsModerationLogChannelHandler(b),
+			"moderation/disable": settingsModerationDisableHandler(b),
+			"moderation/enable":  settingsModerationEnableHandler(b),
 		},
 	}
 }
@@ -67,7 +67,7 @@ func settingsModerationDisableHandler(b *dbot.Bot) handler.CommandHandler {
 	}
 }
 
-func settingsModerationLogChannelHandler(b *dbot.Bot) handler.CommandHandler {
+func settingsModerationEnableHandler(b *dbot.Bot) handler.CommandHandler {
 	return func(e *events.ApplicationCommandInteractionCreate) error {
 		data := e.SlashCommandInteractionData()
 		settings, err := b.DB.GuildSettings().Get(*e.GuildID())