projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'runtime-fixes' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
media_proxy
/
media_proxy.ex
diff --git
a/lib/pleroma/web/media_proxy/media_proxy.ex
b/lib/pleroma/web/media_proxy/media_proxy.ex
index 37718f48bb677e07f236d6946581071da4617cee..0fc0a07b269d3bb6af0baf5897e73ffc0bf8c459 100644
(file)
--- a/
lib/pleroma/web/media_proxy/media_proxy.ex
+++ b/
lib/pleroma/web/media_proxy/media_proxy.ex
@@
-3,6
+3,8
@@
defmodule Pleroma.Web.MediaProxy do
def url(nil), do: nil
def url(nil), do: nil
+ def url(""), do: nil
+
def url(url = "/" <> _), do: url
def url(url) do
def url(url = "/" <> _), do: url
def url(url) do
@@
-15,7
+17,10
@@
defmodule Pleroma.Web.MediaProxy do
base64 = Base.url_encode64(url, @base64_opts)
sig = :crypto.hmac(:sha, secret, base64)
sig64 = sig |> Base.url_encode64(@base64_opts)
base64 = Base.url_encode64(url, @base64_opts)
sig = :crypto.hmac(:sha, secret, base64)
sig64 = sig |> Base.url_encode64(@base64_opts)
- Keyword.get(config, :base_url, Pleroma.Web.base_url()) <> "/proxy/#{sig64}/#{base64}"
+ filename = if path = URI.parse(url).path, do: "/" <> Path.basename(path), else: ""
+
+ Keyword.get(config, :base_url, Pleroma.Web.base_url()) <>
+ "/proxy/#{sig64}/#{base64}#{filename}"
end
end
end
end