aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/media_proxy
diff options
context:
space:
mode:
authorhref <href@random.sh>2017-12-12 12:30:24 +0100
committerhref <href@random.sh>2017-12-12 12:30:24 +0100
commitf909aec050498a366d8b0ed6c1b5439b5b0891f1 (patch)
treeb5a70483804129db071db78abd06c934a85a19fc /lib/pleroma/web/media_proxy
parent8e82547179e3e2dab3fde111f162d07e3fb98df7 (diff)
downloadpleroma-f909aec050498a366d8b0ed6c1b5439b5b0891f1.tar.gz
proxy emojis
(i fix emojos better than gargon but sshhhhh)
Diffstat (limited to 'lib/pleroma/web/media_proxy')
-rw-r--r--lib/pleroma/web/media_proxy/media_proxy.ex2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/media_proxy/media_proxy.ex b/lib/pleroma/web/media_proxy/media_proxy.ex
index 21ebdfbbc..23efc18fa 100644
--- 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