pleroma

commit: ac1298fce817e10cb357162441c77d860c4c757d
parent cf0eb0c1c5c945c660295f51c99fe157b2b8229c
Author: lain <lain@soykaf.club>
Date:   Thu,  7 Jan 2021 16:25:39 +0000

Merge branch 'cleanup/unused-proxy-opts' into 'develop'

Cleanup Pleroma.Upload proxy opts

See merge request pleroma/pleroma!3236
Diffstat:
M
config/config.exs
8
--------
M
lib/pleroma/web/plugs/uploaded_media.ex
9
++++++++-

2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/config/config.exs b/config/config.exs
@@ -63,14 +63,6 @@ config :pleroma, Pleroma.Upload,
   filters: [Pleroma.Upload.Filter.Dedupe],
   link_name: false,
   proxy_remote: false,
-  proxy_opts: [
-    redirect_on_failure: false,
-    max_body_length: 25 * 1_048_576,
-    http: [
-      follow_redirect: true,
-      pool: :upload
-    ]
-  ],
   filename_display_max_length: 30,
   default_description: nil
 
diff --git 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