summaryrefslogtreecommitdiffstats
path: root/api/file.go
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-07-28 11:14:16 -0400
committerChristopher Speller <crspeller@gmail.com>2015-07-28 11:14:16 -0400
commit2602f3b49edd92cc292a49cca26377f19f1ccf4b (patch)
tree2785d6eb37fa6eb039611d3ec6c43c998ba8ee8d /api/file.go
parentec2e61bc55aa12c4157937ed6492e109ad3422ae (diff)
parent892fe2b7b6b801e31dd23d74be14d68c989a4d12 (diff)
downloadchat-2602f3b49edd92cc292a49cca26377f19f1ccf4b.tar.gz
chat-2602f3b49edd92cc292a49cca26377f19f1ccf4b.tar.bz2
chat-2602f3b49edd92cc292a49cca26377f19f1ccf4b.zip
Merge pull request #255 from hmhealey/mm1682
MM-1682 Allow files without file extensions to be attached to messages
Diffstat (limited to 'api/file.go')
-rw-r--r--api/file.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/file.go b/api/file.go
index 889c9dd1b..3ef50fbbd 100644
--- a/api/file.go
+++ b/api/file.go
@@ -33,7 +33,7 @@ func InitFile(r *mux.Router) {
sr := r.PathPrefix("/files").Subrouter()
sr.Handle("/upload", ApiUserRequired(uploadFile)).Methods("POST")
- sr.Handle("/get/{channel_id:[A-Za-z0-9]+}/{user_id:[A-Za-z0-9]+}/{filename:([A-Za-z0-9]+/)?.+\\.[A-Za-z0-9]{3,}}", ApiAppHandler(getFile)).Methods("GET")
+ sr.Handle("/get/{channel_id:[A-Za-z0-9]+}/{user_id:[A-Za-z0-9]+}/{filename:([A-Za-z0-9]+/)?.+(\\.[A-Za-z0-9]{3,})?}", ApiAppHandler(getFile)).Methods("GET")
sr.Handle("/get_public_link", ApiUserRequired(getPublicLink)).Methods("POST")
}