Test message components

cmd/task/main.go

@@ -40,6 +40,10 @@ func handler(interaction discordgo.Interaction) error {
 		}
 	}
 
+	if message == "" {
+		return nil
+	}
+
 	return discord.SendDeferredMessage(interaction.AppID, interaction.Token, message)
 }
 

internal/discord/commands.go

@@ -82,9 +82,15 @@ var (
 				Name:        "partyfinder",
 				Description: "Party Finder command",
 				Options: []*discordgo.ApplicationCommandOption{
+					{
+						Type:        discordgo.ApplicationCommandOptionString,
+						Name:        "description",
+						Description: "Description of the event",
+						Required:    true,
+					},
 					{
 						Type:        discordgo.ApplicationCommandOptionInteger,
-						Name:        "groupsize",
+						Name:        "size",
 						Description: "Group Size",
 						Required:    false,
 					},
@@ -100,12 +106,6 @@ var (
 						Description: "Event's start date",
 						Required:    false,
 					},
-					{
-						Type:        discordgo.ApplicationCommandOptionString,
-						Name:        "description",
-						Description: "Description of the event",
-						Required:    true,
-					},
 				},
 			},
 			Handler: partyfinder,

internal/discord/partyfinder.go

@@ -1,7 +1,6 @@
 package discord
 
 import (
-	"fmt"
 	"log"
 
 	"github.com/bwmarrin/discordgo"
@@ -10,5 +9,36 @@ import (
 func partyfinder(i *discordgo.Interaction, opts ...Option) (string, error) {
 	log.Println("/partyfinder")
 
-	return fmt.Sprintf("/partyfinder %v %v %v %v", i.ApplicationCommandData().Options[0].Value, i.ApplicationCommandData().Options[1].Value, i.ApplicationCommandData().Options[2].Value, i.ApplicationCommandData().Options[3].Value), nil
+	// Create actions row
+	actionsRow := &discordgo.ActionsRow{
+		Components: []discordgo.MessageComponent{
+			// Create buttons
+			discordgo.Button{
+				Label:    "Tank",
+				Style:    discordgo.PrimaryButton,
+				CustomID: "tank",
+			},
+			discordgo.Button{
+				Label:    "Healer",
+				Style:    discordgo.SuccessButton,
+				CustomID: "healer",
+			},
+			discordgo.Button{
+				Label:    "DPS",
+				Style:    discordgo.DangerButton,
+				CustomID: "dps",
+			},
+			discordgo.Button{
+				Label:    "🗑️",
+				Style:    discordgo.SecondaryButton,
+				CustomID: "delete",
+			},
+		},
+	}
+
+	if err := SendDeferredMessage(i.AppID, i.Token, "/partyfinder", WithActionsRow(actionsRow)); err != nil {
+		return "", err
+	}
+
+	return "", nil
 }

internal/discord/utils.go

@@ -17,12 +17,31 @@ const (
 	ErrMissingRole = "You don't have the required role to use this command!"
 )
 
+type message struct {
+	Content    string     `json:"content"`
+	Components components `json:"components"`
+}
+
+type components struct {
+	Type       int                   `json:"type"`
+	Components *discordgo.ActionsRow `json:"components"`
+}
+
 type options struct {
+	actionsRow *discordgo.ActionsRow
+
+	// For tests
 	client *http.Client
 	url    string
 }
 type Option func(*options)
 
+func WithActionsRow(actionsRow *discordgo.ActionsRow) Option {
+	return func(o *options) {
+		o.actionsRow = actionsRow
+	}
+}
+
 func WithClient(client *http.Client) Option {
 	return func(o *options) {
 		o.client = client
@@ -56,16 +75,26 @@ func SendDeferredMessage(appID string, token string, content string, opts ...Opt
 
 	// Defaults
 	config := &options{
+		// For tests
 		client: &http.Client{},
 		url:    DiscordBaseURL,
 	}
 	for _, opt := range opts {
 		opt(config)
 	}
 
-	payload, err := json.Marshal(map[string]string{
-		"content": content,
-	})
+	message := message{
+		Content:    content,
+		Components: components{},
+	}
+	if config.actionsRow != nil {
+		message.Components = components{
+			Type:       int(discordgo.ActionsRowComponent),
+			Components: config.actionsRow,
+		}
+	}
+
+	payload, err := json.Marshal(message)
 	if err != nil {
 		return fmt.Errorf("couldn't marshal JSON: %v", err)
 	}