Ensure that we trim spaces, before removing mention via regex

kubeshop · Nov 15, 2023 · 9848cb2 · 9848cb2
1 parent 1b81f07
commit 9848cb2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pkg/bot/teams_cloud.go b/pkg/bot/teams_cloud.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"regexp"
+	"strings"
 	"sync"
 	"time"
 
@@ -399,6 +400,7 @@ func (b *CloudTeams) setChannels(channels map[string]teamsCloudChannelConfigByID
 }
 
 func (b *CloudTeams) trimBotMention(msg string) string {
+	msg = strings.TrimSpace(msg)
 	return b.botMentionRegex.ReplaceAllString(msg, "")
 }
 

diff --git a/pkg/execute/plugin_executor.go b/pkg/execute/plugin_executor.go
@@ -102,7 +102,7 @@ func (e *PluginExecutor) Execute(ctx context.Context, bindings []string, slackSt
 		Command: cmdCtx.CleanCmd,
 		Configs: configs,
 		Context: executor.ExecuteInputContext{
-			IsInteractivitySupported: e.doesPlatformInteractivity(cmdCtx),
+			IsInteractivitySupported: e.isInteractivitySupported(cmdCtx),
 			SlackState:               slackState,
 			KubeConfig:               kubeconfig,
 			Message: executor.Message{
@@ -146,7 +146,7 @@ func (e *PluginExecutor) Execute(ctx context.Context, bindings []string, slackSt
 	return out, nil
 }
 
-func (e *PluginExecutor) doesPlatformInteractivity(cmdCtx CommandContext) bool {
+func (e *PluginExecutor) isInteractivitySupported(cmdCtx CommandContext) bool {
 	// TODO(https://github.com/kubeshop/botkube-cloud/issues/645): add support for kubectl builder
 	if strings.EqualFold(cmdCtx.CleanCmd, "kubectl") && cmdCtx.Platform == config.CloudTeamsCommPlatformIntegration {
 		// event though the cloud Teams support some interactivity, we do not support the command builder yet.