From 85e70abfcdbf8837aaaec2b351bb2c25280d750a Mon Sep 17 00:00:00 2001 From: Pawel Kosiec Date: Fri, 10 May 2024 00:05:57 +0200 Subject: [PATCH] Update support button for Cloud Slack and Teams (#1443) --- pkg/bot/interactive/help.go | 10 ++++++++-- ...ith_custom_headers_and_default_new_lines.golden.txt | 2 +- ...ith_custom_new_lines_and_default_headers.golden.txt | 2 +- .../TestInteractiveMessageToPlaintext.golden.txt | 2 +- .../TestNewHelpMessage/cloud-slack-help.golden.json | 8 ++++---- .../TestNewHelpMessage/cloud-teams-help.golden.json | 6 +++--- .../testdata/TestNewHelpMessage/discord-help.golden.md | 2 +- .../TestNewHelpMessage/mattermost-help.golden.md | 2 +- 8 files changed, 20 insertions(+), 14 deletions(-) diff --git a/pkg/bot/interactive/help.go b/pkg/bot/interactive/help.go index 300906871..3455ec20a 100644 --- a/pkg/bot/interactive/help.go +++ b/pkg/bot/interactive/help.go @@ -110,10 +110,16 @@ func (h *HelpMessage) footer() []api.Section { btns := api.Buttons{ h.btnBuilder.ForURL("Give feedback", "https://feedback.botkube.io", api.ButtonStylePrimary), h.btnBuilder.ForURL("Read our docs", "https://docs.botkube.io"), - h.btnBuilder.ForURL("Join our Slack", "https://join.botkube.io"), - h.btnBuilder.ForURL("Follow us on Twitter", "https://twitter.com/botkube_io"), } + if h.platform == config.CloudSlackCommPlatformIntegration || h.platform == config.CloudTeamsCommPlatformIntegration { + btns = append(btns, h.btnBuilder.ForURL("Get support", "https://botkube.io/support")) + } else { + btns = append(btns, h.btnBuilder.ForURL("Join our Slack", "https://join.botkube.io")) + } + + btns = append(btns, h.btnBuilder.ForURL("Follow us on Twitter/X", "https://twitter.com/botkube_io")) + if !remote.IsEnabled() { return []api.Section{ { diff --git a/pkg/bot/interactive/testdata/TestInteractiveMessageToMarkdown/render_with_custom_headers_and_default_new_lines.golden.txt b/pkg/bot/interactive/testdata/TestInteractiveMessageToMarkdown/render_with_custom_headers_and_default_new_lines.golden.txt index 1cccfc7c1..f6b4ff23e 100644 --- a/pkg/bot/interactive/testdata/TestInteractiveMessageToMarkdown/render_with_custom_headers_and_default_new_lines.golden.txt +++ b/pkg/bot/interactive/testdata/TestInteractiveMessageToMarkdown/render_with_custom_headers_and_default_new_lines.golden.txt @@ -23,4 +23,4 @@ Automation: https://docs.botkube.io/usage/automated-actions Give feedback: https://feedback.botkube.io Read our docs: https://docs.botkube.io Join our Slack: https://join.botkube.io -Follow us on Twitter: https://twitter.com/botkube_io +Follow us on Twitter/X: https://twitter.com/botkube_io diff --git a/pkg/bot/interactive/testdata/TestInteractiveMessageToMarkdown/render_with_custom_new_lines_and_default_headers.golden.txt b/pkg/bot/interactive/testdata/TestInteractiveMessageToMarkdown/render_with_custom_new_lines_and_default_headers.golden.txt index a5514ee66..9f62ee008 100644 --- a/pkg/bot/interactive/testdata/TestInteractiveMessageToMarkdown/render_with_custom_new_lines_and_default_headers.golden.txt +++ b/pkg/bot/interactive/testdata/TestInteractiveMessageToMarkdown/render_with_custom_new_lines_and_default_headers.golden.txt @@ -1,3 +1,3 @@ **🚀 Botkube instance "testing" is now active.**

**🛠️ Basic commands**
`@Botkube ping` - ping your cluster and check its status `@Botkube list [source|executor|action|alias]` - list available plugins and features
• `@Botkube ping`
• `@Botkube list sources`
• `@Botkube list executors`

**📣 Notifications**
`@Botkube [enable|disable|status] notifications` - set or query your notification status -`@Botkube edit sourcebindings` - select notification sources for this channel
• `@Botkube enable notifications`
• `@Botkube disable notifications`
• `@Botkube status notifications`

**Run kubectl commands (if enabled)**
• `@Botkube kubectl help`

**Other features**
Automation: https://docs.botkube.io/usage/automated-actions

Give feedback: https://feedback.botkube.io
Read our docs: https://docs.botkube.io
Join our Slack: https://join.botkube.io
Follow us on Twitter: https://twitter.com/botkube_io
\ No newline at end of file +`@Botkube edit sourcebindings` - select notification sources for this channel
• `@Botkube enable notifications`
• `@Botkube disable notifications`
• `@Botkube status notifications`

**Run kubectl commands (if enabled)**
• `@Botkube kubectl help`

**Other features**
Automation: https://docs.botkube.io/usage/automated-actions

Give feedback: https://feedback.botkube.io
Read our docs: https://docs.botkube.io
Join our Slack: https://join.botkube.io
Follow us on Twitter/X: https://twitter.com/botkube_io
\ No newline at end of file diff --git a/pkg/bot/interactive/testdata/TestInteractiveMessageToPlaintext.golden.txt b/pkg/bot/interactive/testdata/TestInteractiveMessageToPlaintext.golden.txt index 1da23a842..a54d0f68a 100644 --- a/pkg/bot/interactive/testdata/TestInteractiveMessageToPlaintext.golden.txt +++ b/pkg/bot/interactive/testdata/TestInteractiveMessageToPlaintext.golden.txt @@ -23,4 +23,4 @@ Automation: https://docs.botkube.io/usage/automated-actions Give feedback: https://feedback.botkube.io Read our docs: https://docs.botkube.io Join our Slack: https://join.botkube.io -Follow us on Twitter: https://twitter.com/botkube_io +Follow us on Twitter/X: https://twitter.com/botkube_io diff --git a/test/msg-layouts/testdata/TestNewHelpMessage/cloud-slack-help.golden.json b/test/msg-layouts/testdata/TestNewHelpMessage/cloud-slack-help.golden.json index 5d0f2f6e2..413d838b0 100644 --- a/test/msg-layouts/testdata/TestNewHelpMessage/cloud-slack-help.golden.json +++ b/test/msg-layouts/testdata/TestNewHelpMessage/cloud-slack-help.golden.json @@ -353,17 +353,17 @@ "type": "button", "text": { "type": "plain_text", - "text": "Join our Slack", + "text": "Get support", "emoji": true }, - "action_id": "url:https://join.botkube.io", - "url": "https://join.botkube.io" + "action_id": "url:https://botkube.io/support", + "url": "https://botkube.io/support" }, { "type": "button", "text": { "type": "plain_text", - "text": "Follow us on Twitter", + "text": "Follow us on Twitter/X", "emoji": true }, "action_id": "url:https://twitter.com/botkube_io", diff --git a/test/msg-layouts/testdata/TestNewHelpMessage/cloud-teams-help.golden.json b/test/msg-layouts/testdata/TestNewHelpMessage/cloud-teams-help.golden.json index 96b30a8ab..c0164ee8f 100644 --- a/test/msg-layouts/testdata/TestNewHelpMessage/cloud-teams-help.golden.json +++ b/test/msg-layouts/testdata/TestNewHelpMessage/cloud-teams-help.golden.json @@ -475,13 +475,13 @@ }, { "type": "Action.OpenUrl", - "url": "https://join.botkube.io", - "title": "Join our Slack" + "url": "https://botkube.io/support", + "title": "Get support" }, { "type": "Action.OpenUrl", "url": "https://twitter.com/botkube_io", - "title": "Follow us on Twitter" + "title": "Follow us on Twitter/X" } ], "separator": true diff --git a/test/msg-layouts/testdata/TestNewHelpMessage/discord-help.golden.md b/test/msg-layouts/testdata/TestNewHelpMessage/discord-help.golden.md index 27de3d841..5fd1713c3 100644 --- a/test/msg-layouts/testdata/TestNewHelpMessage/discord-help.golden.md +++ b/test/msg-layouts/testdata/TestNewHelpMessage/discord-help.golden.md @@ -27,4 +27,4 @@ Automation: https://docs.botkube.io/usage/automated-actions Give feedback: https://feedback.botkube.io Read our docs: https://docs.botkube.io Join our Slack: https://join.botkube.io -Follow us on Twitter: https://twitter.com/botkube_io +Follow us on Twitter/X: https://twitter.com/botkube_io diff --git a/test/msg-layouts/testdata/TestNewHelpMessage/mattermost-help.golden.md b/test/msg-layouts/testdata/TestNewHelpMessage/mattermost-help.golden.md index 27de3d841..5fd1713c3 100644 --- a/test/msg-layouts/testdata/TestNewHelpMessage/mattermost-help.golden.md +++ b/test/msg-layouts/testdata/TestNewHelpMessage/mattermost-help.golden.md @@ -27,4 +27,4 @@ Automation: https://docs.botkube.io/usage/automated-actions Give feedback: https://feedback.botkube.io Read our docs: https://docs.botkube.io Join our Slack: https://join.botkube.io -Follow us on Twitter: https://twitter.com/botkube_io +Follow us on Twitter/X: https://twitter.com/botkube_io