diff options
| author | Corey Hulen <corey@hulen.com> | 2015-07-21 15:46:12 -0800 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-07-21 15:46:12 -0800 |
| commit | 269185fb0e252e8105d5f143ca104a069ec10c47 (patch) | |
| tree | 37eb1f616abcd5a923d8c730b9f7a6d1b5b56f2d /model/utils.go | |
| parent | 06bac01e882a7b05519d0e39bccafacd0c27c602 (diff) | |
| parent | 237920e314f3974880d9913aff69faafbe094107 (diff) | |
| download | chat-269185fb0e252e8105d5f143ca104a069ec10c47.tar.gz chat-269185fb0e252e8105d5f143ca104a069ec10c47.tar.bz2 chat-269185fb0e252e8105d5f143ca104a069ec10c47.zip | |
Merge pull request #205 from mattermost/mm-1351
fixes mm-1351 adds local server storage
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 38592b984..093a54e38 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(`/api/v1/files/(get|get_image)/([A-Za-z0-9]{26})/([A-Za-z0-9]{26})/(([A-Za-z0-9]+/)?.+\.[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} |