diff options
author | Asaad Mahmood <Unknowngi@live.com> | 2015-07-29 20:55:56 +0500 |
---|---|---|
committer | Asaad Mahmood <Unknowngi@live.com> | 2015-07-29 20:55:56 +0500 |
commit | 1c186121fe04fb61d945f0b57112e28675c8e066 (patch) | |
tree | f2cf511b15990bd01bfde349016388af39f8d340 /model/utils.go | |
parent | 5d77ff4bcde3496554551701438c1f42550e58b3 (diff) | |
parent | 27dbcd8767426a60699d2acbeeb9b8a825d5b728 (diff) | |
download | chat-1c186121fe04fb61d945f0b57112e28675c8e066.tar.gz chat-1c186121fe04fb61d945f0b57112e28675c8e066.tar.bz2 chat-1c186121fe04fb61d945f0b57112e28675c8e066.zip |
Merge branch 'master' of https://github.com/mattermost/platform
Diffstat (limited to 'model/utils.go')
-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 093a54e38..c7f991da2 100644 --- a/model/utils.go +++ b/model/utils.go @@ -319,6 +319,6 @@ func ClearMentionTags(post string) string { } var UrlRegex = regexp.MustCompile(`^((?:[a-z]+:\/\/)?(?:(?:[a-z0-9\-]+\.)+(?:[a-z]{2}|aero|arpa|biz|com|coop|edu|gov|info|int|jobs|mil|museum|name|nato|net|org|pro|travel|local|internal))(:[0-9]{1,5})?(?:\/[a-z0-9_\-\.~]+)*(\/([a-z0-9_\-\.]*)(?:\?[a-z0-9+_~\-\.%=&]*)?)?(?:#[a-zA-Z0-9!$&'()*+.=-_~:@/?]*)?)(?:\s+|$)$`) -var PartialUrlRegex = regexp.MustCompile(`/([A-Za-z0-9]{26})/([A-Za-z0-9]{26})/((?:[A-Za-z0-9]{26})?.+\.[A-Za-z0-9]{3,})`) +var PartialUrlRegex = regexp.MustCompile(`/([A-Za-z0-9]{26})/([A-Za-z0-9]{26})/((?:[A-Za-z0-9]{26})?.+(?:\.[A-Za-z0-9]{3,})?)`) var SplitRunes = map[rune]bool{',': true, ' ': true, '.': true, '!': true, '?': true, ':': true, ';': true, '\n': true, '<': true, '>': true, '(': true, ')': true, '{': true, '}': true, '[': true, ']': true, '+': true, '/': true, '\\': true} |