diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-06-01 16:05:36 -0400 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-06-01 13:05:36 -0700 |
| commit | 2ea54b9d1e382db8eeb4254dc637e7d04316d01e (patch) | |
| tree | 7ddf3586979f6582e578d933b6c7820776f5b8e3 /model/utils.go | |
| parent | 3ce6dfc71eb8f1bf2e9f2d860cf086424cf1c46d (diff) | |
| download | chat-2ea54b9d1e382db8eeb4254dc637e7d04316d01e.tar.gz chat-2ea54b9d1e382db8eeb4254dc637e7d04316d01e.tar.bz2 chat-2ea54b9d1e382db8eeb4254dc637e7d04316d01e.zip | |
PLT-2283 Improved trimming of punctuation from hashtags and search terms (#3178)
* Improved trimming of punctuation from hashtags and search terms
* Separated punctuation regexes used for hashtags and for search terms
Diffstat (limited to 'model/utils.go')
| -rw-r--r-- | model/utils.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/model/utils.go b/model/utils.go index 443a34bc4..27093c096 100644 --- a/model/utils.go +++ b/model/utils.go @@ -315,10 +315,9 @@ func Etag(parts ...interface{}) string { } var validHashtag = regexp.MustCompile(`^(#[A-Za-zäöüÄÖÜß]+[A-Za-z0-9äöüÄÖÜß_\-]*[A-Za-z0-9äöüÄÖÜß])$`) -var puncStart = regexp.MustCompile(`^[.,()&$!\?\[\]{}':;\\<>\-+=%^*|]+`) +var puncStart = regexp.MustCompile(`^[^\pL\d\s#]+`) var hashtagStart = regexp.MustCompile(`^#{2,}`) -var puncEnd = regexp.MustCompile(`[.,()&$#!\?\[\]{}':;\\<>\-+=%^*|]+$`) -var puncEndWildcard = regexp.MustCompile(`[.,()&$#!\?\[\]{}':;\\<>\-+=%^|]+$`) +var puncEnd = regexp.MustCompile(`[^\pL\d\s]+$`) func ParseHashtags(text string) (string, string) { words := strings.Fields(text) |