diff options
author | JoramWilander <jwawilander@gmail.com> | 2015-12-11 13:03:14 -0500 |
---|---|---|
committer | JoramWilander <jwawilander@gmail.com> | 2015-12-11 13:03:14 -0500 |
commit | b660acf8f893972c56817cfa49e8318f40aa32a0 (patch) | |
tree | f13bbb7255ddfa078afa4400313c733e10ed3cf7 /model/utils.go | |
parent | ce03fbc6d8176b6d5a903312241a948f59785a04 (diff) | |
download | chat-b660acf8f893972c56817cfa49e8318f40aa32a0.tar.gz chat-b660acf8f893972c56817cfa49e8318f40aa32a0.tar.bz2 chat-b660acf8f893972c56817cfa49e8318f40aa32a0.zip |
Add hashtag testing and allow special german characters
Diffstat (limited to 'model/utils.go')
-rw-r--r-- | model/utils.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/model/utils.go b/model/utils.go index 5596b06ff..617c95efd 100644 --- a/model/utils.go +++ b/model/utils.go @@ -273,9 +273,9 @@ func Etag(parts ...interface{}) string { return etag } -var validHashtag = regexp.MustCompile(`^(#[A-Za-z]+[A-Za-z0-9_\-]*[A-Za-z0-9])$`) -var puncStart = regexp.MustCompile(`^[.,()&$!\[\]{}':;\\]+`) -var puncEnd = regexp.MustCompile(`[.,()&$#!\[\]{}';\\]+$`) +var validHashtag = regexp.MustCompile(`^(#[A-Za-zäöüÄÖÜß]+[A-Za-z0-9äöüÄÖÜß_\-]*[A-Za-z0-9äöüÄÖÜß])$`) +var puncStart = regexp.MustCompile(`^[.,()&$!\?\[\]{}':;\\]+`) +var puncEnd = regexp.MustCompile(`[.,()&$#!\?\[\]{}';\\]+$`) func ParseHashtags(text string) (string, string) { words := strings.Fields(text) |