diff options
author | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-13 08:16:38 -0500 |
---|---|---|
committer | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-13 08:16:38 -0500 |
commit | 8b79f5d49cb8d4877e136a76e515edef41ef6f28 (patch) | |
tree | 95feb1a0b94f43fd38533adc508df2daf823ea86 /app/post.go | |
parent | 32c1f7be239ddb19d6c59b114d9ae1a543f8ba9c (diff) | |
parent | fbef16f8630f74248157c2cd9e546ece355c869a (diff) | |
download | chat-8b79f5d49cb8d4877e136a76e515edef41ef6f28.tar.gz chat-8b79f5d49cb8d4877e136a76e515edef41ef6f28.tar.bz2 chat-8b79f5d49cb8d4877e136a76e515edef41ef6f28.zip |
Merge branch 'ccbrown-rm-willnorris-proxy-support' into release-4.7
Diffstat (limited to 'app/post.go')
-rw-r--r-- | app/post.go | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/app/post.go b/app/post.go index 1964bd3cf..a541797fa 100644 --- a/app/post.go +++ b/app/post.go @@ -6,8 +6,6 @@ package app import ( "crypto/hmac" "crypto/sha1" - "crypto/sha256" - "encoding/base64" "encoding/hex" "encoding/json" "fmt" @@ -950,18 +948,6 @@ func (a *App) ImageProxyAdder() func(string) string { mac.Write([]byte(url)) digest := hex.EncodeToString(mac.Sum(nil)) return proxyURL + digest + "/" + hex.EncodeToString([]byte(url)) - case "willnorris/imageproxy": - options := strings.Split(options, "|") - if len(options) > 1 { - mac := hmac.New(sha256.New, []byte(options[1])) - mac.Write([]byte(url)) - digest := base64.URLEncoding.EncodeToString(mac.Sum(nil)) - if options[0] == "" { - return proxyURL + "s" + digest + "/" + url - } - return proxyURL + options[0] + ",s" + digest + "/" + url - } - return proxyURL + options[0] + "/" + url } return url @@ -984,12 +970,6 @@ func (a *App) ImageProxyRemover() (f func(string) string) { } } } - case "willnorris/imageproxy": - if strings.HasPrefix(url, proxyURL) { - if slash := strings.IndexByte(url[len(proxyURL):], '/'); slash >= 0 { - return url[len(proxyURL)+slash+1:] - } - } } return url |