aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
diff options
context:
space:
mode:
authorhref <href@random.sh>2017-11-22 19:14:03 +0100
committerhref <href@random.sh>2017-11-28 20:50:42 +0100
commite28c110eba5a4c8c5b4b3d2f552a8706db511c51 (patch)
treeb4bc38ef56b742c1fd610d277a15eaa199b51215 /lib/pleroma
parent5f35fdcf5d7bc0dc6054eda06d565268f9e79b33 (diff)
downloadpleroma-e28c110eba5a4c8c5b4b3d2f552a8706db511c51.tar.gz
mandatory typo fix...
Diffstat (limited to 'lib/pleroma')
-rw-r--r--lib/pleroma/web/media_proxy/controller.ex3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/pleroma/web/media_proxy/controller.ex b/lib/pleroma/web/media_proxy/controller.ex
index 84c6e9c8b..fece7cf45 100644
--- a/lib/pleroma/web/media_proxy/controller.ex
+++ b/lib/pleroma/web/media_proxy/controller.ex
@@ -3,7 +3,7 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
require Logger
def remote(conn, %{"sig" => sig, "url" => url}) do
- {:ok, url} = Pleroma.MediaProxy.decode_url(sig, url)
+ {:ok, url} = Pleroma.Web.MediaProxy.decode_url(sig, url)
url = url |> URI.encode()
case proxy_request(url) do
{:ok, content_type, body} ->
@@ -19,7 +19,6 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
end
defp proxy_request(link) do
- instance = )
headers = [{"user-agent", "Pleroma/MediaProxy; #{Pleroma.Web.base_url()} <#{Application.get_env(:pleroma, :instance)[:email]}>"}]
options = [:insecure, {:follow_redirect, true}]
case :hackney.request(:get, link, headers, "", options) do