Revert API changes for api.Message

internal/executor/kubectl/builder/kubectl_dropdowns.go

@@ -103,7 +103,7 @@ func PreviewSection(cmd string, input api.LabelInput) []api.Section {
 		},
 		{
 			Buttons: api.Buttons{
-				btn.ForCommand(interactive.RunCommandName, cmd, api.ButtonStylePrimary),
+				btn.ForCommandWithoutDesc(interactive.RunCommandName, cmd, api.ButtonStylePrimary),
 			},
 		},
 	}

internal/executor/x/output/message_parser.go

@@ -100,7 +100,7 @@ func (p *TableCommandParser) renderActions(msgCtx template.ParseMessage, table p
 
 	return api.Section{
 		Buttons: []api.Button{
-			btnBuilder.ForCommand("Raw output", fmt.Sprintf("x run %s %s", cmd, x.RawOutputIndicator)),
+			btnBuilder.ForCommandWithoutDesc("Raw output", fmt.Sprintf("x run %s %s", cmd, x.RawOutputIndicator)),
 		},
 		Selects: api.Selects{
 			Items: []api.Select{

pkg/api/message.go

@@ -268,7 +268,9 @@ const (
 
 // Button holds definition of action button.
 type Button struct {
-	Description      string
+	Description string
+
+	// DescriptionStyle defines the style of the button description. If not provided, the default style (ButtonDescriptionStyleCode) is used.
 	DescriptionStyle ButtonDescriptionStyle
 
 	Name    string
@@ -317,8 +319,8 @@ func (b *ButtonBuilder) DescriptionURL(name, cmd string, url string, style ...Bu
 	}
 }
 
-// ForCommand returns button command without description.
-func (b *ButtonBuilder) ForCommand(name, cmd string, style ...ButtonStyle) Button {
+// ForCommandWithoutDesc returns button command without description.
+func (b *ButtonBuilder) ForCommandWithoutDesc(name, cmd string, style ...ButtonStyle) Button {
 	bt := ButtonStyleDefault
 	if len(style) > 0 {
 		bt = style[0]
@@ -331,6 +333,17 @@ func (b *ButtonBuilder) ForCommand(name, cmd string, style ...ButtonStyle) Butto
 	}
 }
 
+// ForCommand returns button command with description in adaptive code block.
+//
+// For displaying description in bold, use ForCommandWithBoldDesc.
+func (b *ButtonBuilder) ForCommand(name, cmd, desc string, style ...ButtonStyle) Button {
+	bt := ButtonStyleDefault
+	if len(style) > 0 {
+		bt = style[0]
+	}
+	return b.commandWithCmdDesc(name, cmd, desc, bt)
+}
+
 // ForURLWithBoldDesc returns link button with description.
 func (b *ButtonBuilder) ForURLWithBoldDesc(name, desc, url string, style ...ButtonStyle) Button {
 	urlBtn := b.ForURL(name, url, style...)
@@ -353,6 +366,12 @@ func (b *ButtonBuilder) ForURL(name, url string, style ...ButtonStyle) Button {
 		Style: bt,
 	}
 }
+
+func (b *ButtonBuilder) commandWithCmdDesc(name, cmd, desc string, style ButtonStyle) Button {
+	desc = fmt.Sprintf("%s %s", MessageBotNamePlaceholder, desc)
+	return b.commandWithDesc(name, cmd, desc, style, ButtonDescriptionStyleCode)
+}
+
 func (b *ButtonBuilder) commandWithDesc(name, cmd, desc string, style ButtonStyle, descStyle ButtonDescriptionStyle) Button {
 	cmd = fmt.Sprintf("%s %s", MessageBotNamePlaceholder, cmd)
 	return Button{
@@ -363,8 +382,3 @@ func (b *ButtonBuilder) commandWithDesc(name, cmd, desc string, style ButtonStyl
 		Style:            style,
 	}
 }
-
-func (b *ButtonBuilder) commandWithCmdDesc(name, cmd, desc string, style ButtonStyle) Button {
-	desc = fmt.Sprintf("%s %s", MessageBotNamePlaceholder, desc)
-	return b.commandWithDesc(name, cmd, desc, style, ButtonDescriptionStyleCode)
-}

pkg/bot/interactive/help.go

@@ -126,9 +126,9 @@ func (h *HelpMessage) notificationSections() []api.Section {
 				},
 			},
 			Buttons: []api.Button{
-				h.btnBuilder.ForCommand("Enable", "enable notifications"),
-				h.btnBuilder.ForCommand("Disable", "disable notifications"),
-				h.btnBuilder.ForCommand("Get status", "status notifications"),
+				h.btnBuilder.ForCommandWithoutDesc("Enable", "enable notifications"),
+				h.btnBuilder.ForCommandWithoutDesc("Disable", "disable notifications"),
+				h.btnBuilder.ForCommandWithoutDesc("Get status", "status notifications"),
 			},
 		},
 		{
@@ -159,8 +159,8 @@ func (h *HelpMessage) executorSections() []api.Section {
 				Header: "Manage executors and aliases",
 			},
 			Buttons: []api.Button{
-				h.btnBuilder.ForCommand("List executors", "list executors"),
-				h.btnBuilder.ForCommand("List aliases", "list aliases"),
+				h.btnBuilder.ForCommandWithoutDesc("List executors", "list executors"),
+				h.btnBuilder.ForCommandWithoutDesc("List aliases", "list aliases"),
 				h.btnBuilder.ForURL("Executors and aliases help", "https://docs.botkube.io/usage/executor"),
 			},
 		},

pkg/bot/interactive/plugin_help.go

@@ -22,8 +22,8 @@ var pluginHelpProvider = map[string]pluginHelpProviderFn{
 					Header: "Run kubectl commands",
 				},
 				Buttons: []api.Button{
-					btnBuilder.ForCommand("Interactive kubectl", "kubectl", api.ButtonStylePrimary),
-					btnBuilder.ForCommand("kubectl help", "kubectl help"),
+					btnBuilder.ForCommandWithoutDesc("Interactive kubectl", "kubectl", api.ButtonStylePrimary),
+					btnBuilder.ForCommandWithoutDesc("kubectl help", "kubectl help"),
 				},
 			}
 		}
@@ -34,7 +34,7 @@ var pluginHelpProvider = map[string]pluginHelpProviderFn{
 				Header: "Run kubectl commands (if enabled)",
 			},
 			Buttons: []api.Button{
-				btnBuilder.ForCommand("kubectl help", "kubectl help"),
+				btnBuilder.ForCommandWithoutDesc("kubectl help", "kubectl help"),
 			},
 		}
 	},

pkg/bot/slack_renderer.go

@@ -284,10 +284,13 @@ func (b *SlackRenderer) renderButtonsWithDescription(in api.Buttons) []slack.Blo
 	for _, btn := range in {
 		desc := btn.Description
 		switch btn.DescriptionStyle {
-		case api.ButtonDescriptionStyleCode:
-			desc = formatx.AdaptiveCodeBlock(desc)
 		case api.ButtonDescriptionStyleBold:
 			desc = fmt.Sprintf("*%s*", desc)
+		case api.ButtonDescriptionStyleCode:
+			fallthrough
+		default:
+			// keep backward compatibility
+			desc = formatx.AdaptiveCodeBlock(desc)
 		}
 
 		out = append(out, slack.NewSectionBlock(