Add support for params in slack commands (#153)

alexbrazier · Jul 4, 2021 · 7b1a019 · 7b1a019
1 parent f028e5c
commit 7b1a019
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/api/handler/handler.go b/api/handler/handler.go
@@ -16,3 +16,9 @@ func ValidateKey(key string) bool {
 	r, _ := regexp.Compile("^[\\w-]+$")
 	return r.MatchString(key)
 }
+
+// ValidateKeyPath validates a key with optional parameters
+func ValidateKeyPath(key string) bool {
+	r, _ := regexp.Compile("^[\\w-\\/]+$")
+	return r.MatchString(key)
+}
diff --git a/api/handler/slack.go b/api/handler/slack.go
@@ -126,16 +126,17 @@ func (h *Handler) SlackCommand(c echo.Context) error {
 	}
 
 	key := payload.Text
-	if ValidateKey(key) == false {
+	if ValidateKeyPath(key) == false {
 		response.Text = "The URL key you provided is an invalid format. You can only provide one key at a time, e.g. `/go help`"
 		return c.JSON(http.StatusOK, response)
 	}
 	appURI := config.GetConfig().AppURI
-	url, err := urlModel.Find(key)
-	if err != nil || url == nil {
+	urls, err := urlModel.GetUrlsFromKeys([]string{key})
+	if err != nil || len(urls) == 0 {
 		response.Text = fmt.Sprintf("The URL key you provided was not found. Why not add it? %s/go/%s", appURI, key)
 		return c.JSON(http.StatusOK, response)
 	}
+	url := urls[0]
 	response.Text = fmt.Sprintf("%s/%s", appURI, key)
 	if url.URL == "" {
 		aliasURLs := make([]string, len(url.Alias))

diff --git a/api/slackbot/slackbot.go b/api/slackbot/slackbot.go
@@ -22,7 +22,7 @@ type SlackBot struct {
 }
 
 func (s *SlackBot) getKeyFromText(text string) string {
-	r, _ := regexp.Compile("\\bgo ([\\w-]+)\\b")
+	r, _ := regexp.Compile("\\bgo ([\\w-\\/]+)\\b")
 
 	matches := r.FindStringSubmatch(text)
 
@@ -78,12 +78,12 @@ func (s *SlackBot) Init() {
 				}
 				// Edit message if previous one exists
 				if oldKey != "" {
-					url, err := urlModel.Find(oldKey)
+					urls, err := urlModel.GetUrlsFromKeys([]string{oldKey})
 					if err != nil {
 						fmt.Printf("An error occurred while finding old key %v", err)
 						break
 					}
-					if url != nil {
+					if len(urls) > 0 {
 						edited = true
 					}
 				}
@@ -98,28 +98,29 @@ func (s *SlackBot) Init() {
 				break
 			}
 
-			url, err := urlModel.Find(key)
+			urls, err := urlModel.GetUrlsFromKeys([]string{key})
 			if err != nil {
 				fmt.Printf("An error occurred while finding key %v", err)
 				break
 			}
-			if url == nil {
+			if len(urls) == 0 {
 				if ev.PreviousMessage != nil {
 					s.deleteMessage(ev.Channel, ev.PreviousMessage.Timestamp)
 				}
 				break
 			}
+			url := urls[0]
 			appURI := appConfig.AppURI
 
 			extraText := url.URL
 			if url.URL == "" {
-				urls, err := urlModel.GetUrlsFromKeys(url.Alias)
+				aliasUrls, err := urlModel.GetUrlsFromKeys(url.Alias)
 				if err != nil {
 					fmt.Println("Error while processing slackbot aliases")
 					break
 				}
-				urlStrings := make([]string, len(urls))
-				for i, url := range urls {
+				urlStrings := make([]string, len(aliasUrls))
+				for i, url := range aliasUrls {
 					urlStrings[i] = url.URL
 				}
 				extraText = strings.Join(urlStrings, "\n")