diff options
| author | hmhealey <harrisonmhealey@gmail.com> | 2016-01-25 16:47:49 -0500 |
|---|---|---|
| committer | hmhealey <harrisonmhealey@gmail.com> | 2016-01-26 10:20:36 -0500 |
| commit | 97ede2a428faf3a62ce0140e51ed591e261c09a1 (patch) | |
| tree | 579a8970f42373bc99ed12dc6d46f0c47947815a /model/search_params.go | |
| parent | ab5425f9b9f8a2e3ead637a27dc01bc9d06e16b7 (diff) | |
| download | chat-97ede2a428faf3a62ce0140e51ed591e261c09a1.tar.gz chat-97ede2a428faf3a62ce0140e51ed591e261c09a1.tar.bz2 chat-97ede2a428faf3a62ce0140e51ed591e261c09a1.zip | |
Updated serverside hashtag regex to ignore more punctuation around words
Diffstat (limited to 'model/search_params.go')
| -rw-r--r-- | model/search_params.go | 18 |
1 files changed, 11 insertions, 7 deletions
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) + } } } |