diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-07-05 09:02:23 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-07-05 09:02:23 -0800 |
| commit | 592d68cf4134b668e3ff962d17f8aa75b1bc055f (patch) | |
| tree | 6e743b07487caf5fe350439aefdf0355a7e80d9b /model/utils.go | |
| parent | 72bfc1ee2afd2fa4a34186b62f144f8f6c50d693 (diff) | |
| parent | 4a3003c0dcf7d642f233493e32b07beed5d08327 (diff) | |
| download | chat-592d68cf4134b668e3ff962d17f8aa75b1bc055f.tar.gz chat-592d68cf4134b668e3ff962d17f8aa75b1bc055f.tar.bz2 chat-592d68cf4134b668e3ff962d17f8aa75b1bc055f.zip | |
Merge branch 'master' into mm-1391
Diffstat (limited to 'model/utils.go')
| -rw-r--r-- | model/utils.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/model/utils.go b/model/utils.go index 262bda319..50e427694 100644 --- a/model/utils.go +++ b/model/utils.go @@ -17,7 +17,7 @@ import ( ) const ( - ETAG_ROOT_VERSION = "10" + ETAG_ROOT_VERSION = "11" ) type StringMap map[string]string @@ -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(`[.,()&$#!\[\]{}"':;\\]+$`) |