Support setting 'URL' for NewButtonBlockElement

slack-go · Dec 20, 2023 · d573676 · d573676
1 parent e715221
commit d573676
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 31 deletions.
diff --git a/block_action_test.go b/block_action_test.go
@@ -9,7 +9,7 @@ import (
 func TestNewActionBlock(t *testing.T) {
 
 	approveBtnTxt := NewTextBlockObject("plain_text", "Approve", false, false)
-	approveBtn := NewButtonBlockElement("", "click_me_123", approveBtnTxt)
+	approveBtn := NewButtonBlockElement("", "click_me_123", "", approveBtnTxt)
 
 	actionBlock := NewActionBlock("test", approveBtn)
 	assert.Equal(t, string(actionBlock.Type), "actions")

diff --git a/block_element.go b/block_element.go
@@ -178,11 +178,12 @@ func (s *ButtonBlockElement) WithConfirm(confirm *ConfirmationBlockObject) *Butt
 }
 
 // NewButtonBlockElement returns an instance of a new button element to be used within a block
-func NewButtonBlockElement(actionID, value string, text *TextBlockObject) *ButtonBlockElement {
+func NewButtonBlockElement(actionID, value, url string, text *TextBlockObject) *ButtonBlockElement {
 	return &ButtonBlockElement{
 		Type:     METButton,
 		ActionID: actionID,
 		Text:     text,
+		URL:      url,
 		Value:    value,
 	}
 }

diff --git a/block_element_test.go b/block_element_test.go
@@ -19,20 +19,21 @@ func TestNewImageBlockElement(t *testing.T) {
 func TestNewButtonBlockElement(t *testing.T) {
 
 	btnTxt := NewTextBlockObject("plain_text", "Next 2 Results", false, false)
-	btnElement := NewButtonBlockElement("test", "click_me_123", btnTxt)
+	btnElement := NewButtonBlockElement("test", "click_me_123", "https://foo.com", btnTxt)
 
 	assert.Equal(t, string(btnElement.Type), "button")
 	assert.Equal(t, btnElement.ActionID, "test")
 	assert.Equal(t, btnElement.Value, "click_me_123")
 	assert.Equal(t, btnElement.Text.Text, "Next 2 Results")
+	assert.Equal(t, btnElement.URL, "https://foo.com")
 
 }
 
 func TestWithStyleForButtonElement(t *testing.T) {
 
 	// these values are irrelevant in this test
 	btnTxt := NewTextBlockObject("plain_text", "Next 2 Results", false, false)
-	btnElement := NewButtonBlockElement("test", "click_me_123", btnTxt)
+	btnElement := NewButtonBlockElement("test", "click_me_123", "", btnTxt)
 
 	btnElement.WithStyle(StyleDefault)
 	assert.Equal(t, btnElement.Style, Style(""))

diff --git a/examples/blocks/blocks.go b/examples/blocks/blocks.go
@@ -67,10 +67,10 @@ func exampleOne() {
 
 	// Approve and Deny Buttons
 	approveBtnTxt := slack.NewTextBlockObject("plain_text", "Approve", false, false)
-	approveBtn := slack.NewButtonBlockElement("", "click_me_123", approveBtnTxt)
+	approveBtn := slack.NewButtonBlockElement("", "click_me_123", "", approveBtnTxt)
 
 	denyBtnTxt := slack.NewTextBlockObject("plain_text", "Deny", false, false)
-	denyBtn := slack.NewButtonBlockElement("", "click_me_123", denyBtnTxt)
+	denyBtn := slack.NewButtonBlockElement("", "click_me_123", "", denyBtnTxt)
 
 	actionBlock := slack.NewActionBlock("", approveBtn, denyBtn)
 
@@ -107,10 +107,10 @@ func exampleTwo() {
 
 	// Approve and Deny Buttons
 	approveBtnTxt := slack.NewTextBlockObject("plain_text", "Approve", false, false)
-	approveBtn := slack.NewButtonBlockElement("", "click_me_123", approveBtnTxt)
+	approveBtn := slack.NewButtonBlockElement("", "click_me_123", "", approveBtnTxt)
 
 	denyBtnTxt := slack.NewTextBlockObject("plain_text", "Deny", false, false)
-	denyBtn := slack.NewButtonBlockElement("", "click_me_123", denyBtnTxt)
+	denyBtn := slack.NewButtonBlockElement("", "click_me_123", "", denyBtnTxt)
 
 	actionBlock := slack.NewActionBlock("", approveBtn, denyBtn)
 
@@ -137,7 +137,7 @@ func exampleThree() {
 
 	// Shared Assets for example
 	chooseBtnText := slack.NewTextBlockObject("plain_text", "Choose", true, false)
-	chooseBtnEle := slack.NewButtonBlockElement("", "click_me_123", chooseBtnText)
+	chooseBtnEle := slack.NewButtonBlockElement("", "click_me_123", "", chooseBtnText)
 	divSection := slack.NewDividerBlock()
 
 	// Header Section
@@ -208,7 +208,7 @@ func exampleFour() {
 	// Shared Assets for example
 	divSection := slack.NewDividerBlock()
 	voteBtnText := slack.NewTextBlockObject("plain_text", "Vote", true, false)
-	voteBtnEle := slack.NewButtonBlockElement("", "click_me_123", voteBtnText)
+	voteBtnEle := slack.NewButtonBlockElement("", "click_me_123", "", voteBtnText)
 	profileOne := slack.NewImageBlockElement("https://api.slack.com/img/blocks/bkb_template_images/profile_1.png", "Michael Scott")
 	profileTwo := slack.NewImageBlockElement("https://api.slack.com/img/blocks/bkb_template_images/profile_2.png", "Dwight Schrute")
 	profileThree := slack.NewImageBlockElement("https://api.slack.com/img/blocks/bkb_template_images/profile_3.png", "Pam Beasely")
@@ -244,7 +244,7 @@ func exampleFour() {
 
 	// Suggestions Action
 	btnTxt := slack.NewTextBlockObject("plain_text", "Add a suggestion", false, false)
-	nextBtn := slack.NewButtonBlockElement("", "click_me_123", btnTxt)
+	nextBtn := slack.NewButtonBlockElement("", "click_me_123", "", btnTxt)
 	actionBlock := slack.NewActionBlock("", nextBtn)
 
 	// Build Message with blocks created above
@@ -325,7 +325,7 @@ func exampleFive() {
 
 	// Action button
 	btnTxt := slack.NewTextBlockObject("plain_text", "Next 2 Results", false, false)
-	nextBtn := slack.NewButtonBlockElement("", "click_me_123", btnTxt)
+	nextBtn := slack.NewButtonBlockElement("", "click_me_123", "", btnTxt)
 	actionBlock := slack.NewActionBlock("", nextBtn)
 
 	// Build Message with blocks created above
@@ -398,7 +398,7 @@ func exampleSix() {
 	// Next Results Button
 	// Suggestions Action
 	btnTxt := slack.NewTextBlockObject("plain_text", "Next 5 Results", false, false)
-	nextBtn := slack.NewButtonBlockElement("", "click_me_123", btnTxt)
+	nextBtn := slack.NewButtonBlockElement("", "click_me_123", "", btnTxt)
 	actionBlock := slack.NewActionBlock("", nextBtn)
 
 	// Build Message with blocks created above
@@ -429,9 +429,9 @@ func unmarshalExample() {
 
 	// Append ActionBlock for marshalling
 	btnTxt := slack.NewTextBlockObject("plain_text", "Add a suggestion", false, false)
-	nextBtn := slack.NewButtonBlockElement("", "click_me_123", btnTxt)
+	nextBtn := slack.NewButtonBlockElement("", "click_me_123", "", btnTxt)
 	approveBtnTxt := slack.NewTextBlockObject("plain_text", "Approve", false, false)
-	approveBtn := slack.NewButtonBlockElement("", "click_me_123", approveBtnTxt)
+	approveBtn := slack.NewButtonBlockElement("", "click_me_123", "", approveBtnTxt)
 	msgBlocks = append(msgBlocks, slack.NewActionBlock("", nextBtn, approveBtn))
 
 	// Append ContextBlock for marshalling

diff --git a/examples/socketmode/socketmode.go b/examples/socketmode/socketmode.go
@@ -127,14 +127,10 @@ func main() {
 							},
 							nil,
 							slack.NewAccessory(
-								slack.NewButtonBlockElement(
-									"",
-									"somevalue",
-									&slack.TextBlockObject{
-										Type: slack.PlainTextType,
-										Text: "bar",
-									},
-								),
+								slack.NewButtonBlockElement("", "somevalue", "", &slack.TextBlockObject{
+									Type: slack.PlainTextType,
+									Text: "bar",
+								}),
 							),
 						),
 					},

diff --git a/examples/socketmode_handler/socketmode_handler.go b/examples/socketmode_handler/socketmode_handler.go
@@ -186,14 +186,10 @@ func middlewareSlashCommand(evt *socketmode.Event, client *socketmode.Client) {
 				},
 				nil,
 				slack.NewAccessory(
-					slack.NewButtonBlockElement(
-						"",
-						"somevalue",
-						&slack.TextBlockObject{
-							Type: slack.PlainTextType,
-							Text: "bar",
-						},
-					),
+					slack.NewButtonBlockElement("", "somevalue", "", &slack.TextBlockObject{
+						Type: slack.PlainTextType,
+						Text: "bar",
+					}),
 				),
 			),
 		}}