X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fmedia_proxy%2Fcontroller.ex;h=9327e7253aa949243d63dd4a1de91c7465238552;hb=78516a8daa7094506e0247e8bdaddfde77a4ba67;hp=0ac70c9d817080754d566e8eed9b56927d4190aa;hpb=35ac549a99f325d2e73c03d7c2951f3d6570b7b4;p=akkoma

diff --git a/lib/pleroma/web/media_proxy/controller.ex b/lib/pleroma/web/media_proxy/controller.ex
index 0ac70c9d8..9327e7253 100644
--- a/lib/pleroma/web/media_proxy/controller.ex
+++ b/lib/pleroma/web/media_proxy/controller.ex
@@ -2,6 +2,8 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
   use Pleroma.Web, :controller
   require Logger
 
+  @httpoison Application.get_env(:pleroma, :httpoison)
+  
   @max_body_length 25 * 1048576
 
   @cache_control %{
@@ -14,7 +16,6 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
     with \
       true <- Keyword.get(config, :enabled, false),
       {:ok, url} <- Pleroma.Web.MediaProxy.decode_url(sig, url),
-      url = URI.encode(url),
       {:ok, content_type, body} <- proxy_request(url)
     do
       conn
@@ -30,7 +31,7 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
 
   defp proxy_request(link) do
     headers = [{"user-agent", "Pleroma/MediaProxy; #{Pleroma.Web.base_url()} <#{Application.get_env(:pleroma, :instance)[:email]}>"}]
-    options = [:insecure, {:follow_redirect, true}]
+    options = @httpoison.process_request_options([:insecure, {:follow_redirect, true}])
     with \
       {:ok, 200, headers, client} <- :hackney.request(:get, link, headers, "", options),
       headers = Enum.into(headers, Map.new),