pleroma

commit: 148bc244359e70c87ec2812c65da83fe87efbc68
parent b4860c57a63b48ded8eaa37b9f40cc0851c78882
Author: Ivan Tashkinov <ivantashkinov@gmail.com>
Date:   Thu, 10 Sep 2020 11:54:10 +0300

[#2497] Removed Hackney-specific code
(no longer needed due to adapter options unification).

Diffstat:
M
lib/pleroma/web/activity_pub/mrf/media_proxy_warming_policy.ex
13
+++----------

1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/lib/pleroma/web/activity_pub/mrf/media_proxy_warming_policy.ex b/lib/pleroma/web/activity_pub/mrf/media_proxy_warming_policy.ex
@@ -13,17 +13,10 @@ defmodule Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy do
   require Logger
 
   @adapter_options [
-    pool: :media
+    pool: :media,
+    recv_timeout: 10_000
   ]
 
-  defp adapter_options do
-    if Application.get_env(:tesla, :adapter) == Tesla.Adapter.Hackney do
-      Keyword.put(@adapter_options, :recv_timeout, 10_000)
-    else
-      @adapter_options
-    end
-  end
-
   def perform(:prefetch, url) do
     # Fetching only proxiable resources
     if MediaProxy.enabled?() and MediaProxy.url_proxiable?(url) do
@@ -32,7 +25,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy do
 
       Logger.debug("Prefetching #{inspect(url)} as #{inspect(prefetch_url)}")
 
-      HTTP.get(prefetch_url, [], adapter: adapter_options())
+      HTTP.get(prefetch_url, [], @adapter_options)
     end
   end