projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Actually fix incoming attachments.
[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 21ebdfbbc13fcb2a51c3c05deed89714891b6fbc..23efc18faaa37275476453fa2e76020e8bd31644 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(url = "/" <> _), do: url
+
def url(url) do
config = Application.get_env(:pleroma, :media_proxy, [])
if !Keyword.get(config, :enabled, false) or String.starts_with?(url, Pleroma.Web.base_url) do