squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mandatory typo fix...

Browse Source
This commit is contained in:
href 2017-11-22 19:14:03 +01:00
parent 5f35fdcf5d
commit e28c110eba
No known key found for this signature in database
GPG Key ID: EE8296C1A152C325
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pleroma/web/media_proxy/controller.ex
View File

@ -3,7 +3,7 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
require Logger require Logger
def remote(conn, %{"sig" => sig, "url" => url}) do 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() url = url |> URI.encode()
case proxy_request(url) do case proxy_request(url) do
{:ok, content_type, body} -> {:ok, content_type, body} ->
@ -19,7 +19,6 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
end end
defp proxy_request(link) do defp proxy_request(link) do
instance = )
headers = [{"user-agent", "Pleroma/MediaProxy; #{Pleroma.Web.base_url()} <#{Application.get_env(:pleroma, :instance)[:email]}>"}] headers = [{"user-agent", "Pleroma/MediaProxy; #{Pleroma.Web.base_url()} <#{Application.get_env(:pleroma, :instance)[:email]}>"}]
options = [:insecure, {:follow_redirect, true}] options = [:insecure, {:follow_redirect, true}]
case :hackney.request(:get, link, headers, "", options) do case :hackney.request(:get, link, headers, "", options) do