projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into feature/compat/push-subscriptions
[akkoma]
/
lib
/
pleroma
/
web
/
media_proxy
/
controller.ex
diff --git
a/lib/pleroma/web/media_proxy/controller.ex
b/lib/pleroma/web/media_proxy/controller.ex
index 10e6b4e52e90d5d000695ac851c31b77c9b43ca2..bb257c2622f87515cb2df5d9e222d9b5f4c84ab4 100644
(file)
--- a/
lib/pleroma/web/media_proxy/controller.ex
+++ b/
lib/pleroma/web/media_proxy/controller.ex
@@
-30,7
+30,7
@@
defmodule Pleroma.Web.MediaProxy.MediaProxyController do
with true <- Keyword.get(config, :enabled, false),
{:ok, url} <- Pleroma.Web.MediaProxy.decode_url(sig, url),
with true <- Keyword.get(config, :enabled, false),
{:ok, url} <- Pleroma.Web.MediaProxy.decode_url(sig, url),
- filename <- Path.basename(
url
),
+ filename <- Path.basename(
URI.parse(url).path
),
true <-
if(Map.get(params, "filename"),
do: filename == Path.basename(conn.request_path),
true <-
if(Map.get(params, "filename"),
do: filename == Path.basename(conn.request_path),