Remove configurability of upload proxy opts, simplify

2021-01-05 15:06:00 -06:00 · 2021-01-05 15:06:00 -06:00 · d69c78ceb9
commit d69c78ceb9
parent 18296c7473
2 changed files with 8 additions and 9 deletions
--- a/lib/pleroma/web/plugs/uploaded_media.ex
+++ b/lib/pleroma/web/plugs/uploaded_media.ex
@ -87,8 +87,15 @@ defmodule Pleroma.Web.Plugs.UploadedMedia do
  end

  defp get_media(conn, {:url, url}, true, _) do
+    proxy_opts = [
+      http: [
+        follow_redirect: true,
+        pool: :upload
+      ]
+    ]
+
    conn
-    |> Pleroma.ReverseProxy.call(url, Pleroma.Config.get([Pleroma.Upload, :proxy_opts], []))
+    |> Pleroma.ReverseProxy.call(url, proxy_opts)
  end

  defp get_media(conn, {:url, url}, _, _) do