diff options
| author | Corey Hulen <corey@hulen.com> | 2015-06-30 19:46:25 -0800 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-06-30 19:46:25 -0800 |
| commit | 75c19380776e9ebf30345a922bd3a0e2df0711f4 (patch) | |
| tree | c4d2128772fb279b5d2c2641162e6304a98a163a /model | |
| parent | 1200f764842ec11557b686ca9226b357ff5b0c93 (diff) | |
| parent | bcc31b714b19ff3817c96c801028e23ace8cc55b (diff) | |
| download | chat-75c19380776e9ebf30345a922bd3a0e2df0711f4.tar.gz chat-75c19380776e9ebf30345a922bd3a0e2df0711f4.tar.bz2 chat-75c19380776e9ebf30345a922bd3a0e2df0711f4.zip | |
Merge pull request #110 from nickago/MM-1430
MM-1430 Added the ability to have hashtags with dashes in them
Diffstat (limited to 'model')
| -rw-r--r-- | model/utils.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/model/utils.go b/model/utils.go index cc51dfe47..50e427694 100644 --- a/model/utils.go +++ b/model/utils.go @@ -260,7 +260,7 @@ func Etag(parts ...interface{}) string { return etag } -var validHashtag = regexp.MustCompile(`^(#[A-Za-z]+[A-Za-z0-9_]*[A-Za-z0-9])$`) +var validHashtag = regexp.MustCompile(`^(#[A-Za-z]+[A-Za-z0-9_\-]*[A-Za-z0-9])$`) var puncStart = regexp.MustCompile(`^[.,()&$!\[\]{}"':;\\]+`) var puncEnd = regexp.MustCompile(`[.,()&$#!\[\]{}"':;\\]+$`) |