X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fmix%2Fpleroma.ex;h=6431f0a1c657028af41beff0e086ac54104e5477;hb=63ce25f32c9bd0dfd5a4db9ad14b6b773c9b05a9;hp=02c40850a7430b7c4c0b74463df007c08b57cc64;hpb=2937495712d760ca8a9388e69cc2336636830743;p=akkoma

diff --git a/lib/mix/pleroma.ex b/lib/mix/pleroma.ex
index 02c40850a..6431f0a1c 100644
--- a/lib/mix/pleroma.ex
+++ b/lib/mix/pleroma.ex
@@ -24,20 +24,20 @@ defmodule Mix.Pleroma do
     Pleroma.Application.limiters_setup()
     Application.put_env(:phoenix, :serve_endpoints, false, persistent: true)
 
+    proxy_url = Pleroma.Config.get([:http, :proxy_url])
+    proxy = Pleroma.HTTP.AdapterHelper.format_proxy(proxy_url)
+
+    finch_config =
+      [:http, :adapter]
+      |> Pleroma.Config.get([])
+      |> Pleroma.HTTP.AdapterHelper.maybe_add_proxy_pool(proxy)
+      |> Keyword.put(:name, MyFinch)
+
     unless System.get_env("DEBUG") do
       Logger.remove_backend(:console)
     end
 
-    adapter = Application.get_env(:tesla, :adapter)
-
-    apps =
-      if adapter == Tesla.Adapter.Gun do
-        [:gun | @apps]
-      else
-        [:hackney | @apps]
-      end
-
-    Enum.each(apps, &Application.ensure_all_started/1)
+    Enum.each(@apps, &Application.ensure_all_started/1)
 
     oban_config = [
       crontab: [],
@@ -53,11 +53,11 @@ defmodule Mix.Pleroma do
         Pleroma.Emoji,
         {Pleroma.Config.TransferTask, false},
         Pleroma.Web.Endpoint,
+        {Finch, finch_config},
         {Oban, oban_config},
         {Majic.Pool,
          [name: Pleroma.MajicPool, pool_size: Pleroma.Config.get([:majic_pool, :size], 2)]}
       ] ++
-        http_children(adapter) ++
         elasticsearch_children()
 
     cachex_children = Enum.map(@cachex_children, &Pleroma.Application.build_cachex(&1, []))
@@ -131,13 +131,6 @@ defmodule Mix.Pleroma do
     ~S(') <> String.replace(path, ~S('), ~S(\')) <> ~S(')
   end
 
-  defp http_children(Tesla.Adapter.Gun) do
-    Pleroma.Gun.ConnectionPool.children() ++
-      [{Task, &Pleroma.HTTP.AdapterHelper.Gun.limiter_setup/0}]
-  end
-
-  defp http_children(_), do: []
-
   def elasticsearch_children do
     config = Pleroma.Config.get([Pleroma.Search, :module])