X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fhttp%2Fhttp.ex;h=26214ef3feca94c4af8e12b2b07c832b0a3c0c7d;hb=b57913b13ad07cfaa345f7d1e964cd37e5545aa5;hp=e572dfedf67657c3d580561572a71e1ba08853b7;hpb=922abcda61298a7bca48894cb9a51a52fdeab1ed;p=akkoma

diff --git a/lib/pleroma/http/http.ex b/lib/pleroma/http/http.ex
index e572dfedf..26214ef3f 100644
--- a/lib/pleroma/http/http.ex
+++ b/lib/pleroma/http/http.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.HTTP do
@@ -10,6 +10,8 @@ defmodule Pleroma.HTTP do
   alias Pleroma.HTTP.Connection
   alias Pleroma.HTTP.RequestBuilder, as: Builder
 
+  @type t :: __MODULE__
+
   @doc """
   Builds and perform http request.
 
@@ -28,6 +30,9 @@ defmodule Pleroma.HTTP do
     options =
       process_request_options(options)
       |> process_sni_options(url)
+      |> process_adapter_options()
+
+    params = Keyword.get(options, :params, [])
 
     %{}
     |> Builder.method(method)
@@ -35,6 +40,7 @@ defmodule Pleroma.HTTP do
     |> Builder.opts(options)
     |> Builder.url(url)
     |> Builder.add_param(:body, :body, body)
+    |> Builder.add_param(:query, :query, params)
     |> Enum.into([])
     |> (&Tesla.request(Connection.new(), &1)).()
   end
@@ -51,10 +57,15 @@ defmodule Pleroma.HTTP do
     end
   end
 
+  def process_adapter_options(options) do
+    adapter_options = Pleroma.Config.get([:http, :adapter], [])
+
+    options ++ [adapter: adapter_options]
+  end
+
   def process_request_options(options) do
     config = Application.get_env(:pleroma, :http, [])
     proxy = Keyword.get(config, :proxy_url, nil)
-    options = options ++ [adapter: [pool: :default]]
 
     case proxy do
       nil -> options