From 97ede2a428faf3a62ce0140e51ed591e261c09a1 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Mon, 25 Jan 2016 16:47:49 -0500 Subject: Updated serverside hashtag regex to ignore more punctuation around words --- model/search_params.go | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'model/search_params.go') diff --git a/model/search_params.go b/model/search_params.go index 17a64d980..9a7406a07 100644 --- a/model/search_params.go +++ b/model/search_params.go @@ -20,12 +20,7 @@ func splitWordsNoQuotes(text string) []string { words := []string{} for _, word := range strings.Fields(text) { - word = puncStart.ReplaceAllString(word, "") - word = puncEnd.ReplaceAllString(word, "") - - if len(word) != 0 { - words = append(words, word) - } + words = append(words, word) } return words @@ -94,7 +89,16 @@ func parseSearchFlags(input []string) ([]string, [][2]string) { } if !isFlag { - words = append(words, word) + // trim off surrounding punctuation + word = puncStart.ReplaceAllString(word, "") + word = puncEnd.ReplaceAllString(word, "") + + // and remove extra pound #s + word = hashtagStart.ReplaceAllString(word, "#") + + if len(word) != 0 { + words = append(words, word) + } } } -- cgit v1.2.3-1-g7c22