WebSub fix test

[akkoma] / lib / pleroma / http / http.ex

diff --git a/lib/pleroma/http/http.ex b/lib/pleroma/http/http.ex
index f222e1774c9253224b97ca7a642a940b79554a57..93ac9d62bc8247d426a2747f6af907e296ec0c6e 100644 (file)
--- a/lib/pleroma/http/http.ex
+++ b/lib/pleroma/http/http.ex
@@ -1,12 +1,21 @@
 defmodule Pleroma.HTTP do
   require HTTPoison
+  alias Pleroma.HTTP.Connection
+  alias Pleroma.HTTP.RequestBuilder, as: Builder
 
   def request(method, url, body \\ "", headers \\ [], options \\ []) do
     options =
       process_request_options(options)
       |> process_sni_options(url)
 
-    HTTPoison.request(method, url, body, headers, options)
+    %{}
+    |> Builder.method(method)
+    |> Builder.headers(headers)
+    |> Builder.opts(options)
+    |> Builder.url(url)
+    |> Builder.add_param(:body, :body, body)
+    |> Enum.into([])
+    |> (&Tesla.request(Connection.new(), &1)).()
   end
 
   defp process_sni_options(options, url) do
@@ -19,10 +28,10 @@ defmodule Pleroma.HTTP do
     end
   end
 
-  defp process_request_options(options) do
+  def process_request_options(options) do
     config = Application.get_env(:pleroma, :http, [])
     proxy = Keyword.get(config, :proxy_url, nil)
-    options = options ++ [hackney: [pool: :default]]
+    options = options ++ [adapter: [pool: :default]]
 
     case proxy do
       nil -> options
@@ -30,7 +39,8 @@ defmodule Pleroma.HTTP do
     end
   end
 
-  def get(url, headers \\ [], options \\ []), do: request(:get, url, "", headers, options)
+  def get(url, headers \\ [], options \\ []),
+    do: request(:get, url, "", headers, options)
 
   def post(url, body, headers \\ [], options \\ []),
     do: request(:post, url, body, headers, options)