Merge branch 'release/2.2.0' into 'stable'v2.2.0

Release/2.2.0

See merge request pleroma/secteam/pleroma!19

1 files changed, 0 insertions, 117 deletions

diff --git a/lib/pleroma/http/http.ex b/lib/pleroma/http/http.ex
deleted file mode 100644
index b37b3fa89..000000000
--- a/lib/pleroma/http/http.ex
+++ /dev/null
@@ -1,117 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.HTTP do
-  @moduledoc """
-    Wrapper for `Tesla.request/2`.
-  """
-
-  alias Pleroma.HTTP.AdapterHelper
-  alias Pleroma.HTTP.Request
-  alias Pleroma.HTTP.RequestBuilder, as: Builder
-  alias Tesla.Client
-  alias Tesla.Env
-
-  require Logger
-
-  @type t :: __MODULE__
-  @type method() :: :get | :post | :put | :delete | :head
-
-  @doc """
-  Performs GET request.
-
-  See `Pleroma.HTTP.request/5`
-  """
-  @spec get(Request.url() | nil, Request.headers(), keyword()) ::
-          nil | {:ok, Env.t()} | {:error, any()}
-  def get(url, headers \\ [], options \\ [])
-  def get(nil, _, _), do: nil
-  def get(url, headers, options), do: request(:get, url, "", headers, options)
-
-  @spec head(Request.url(), Request.headers(), keyword()) :: {:ok, Env.t()} | {:error, any()}
-  def head(url, headers \\ [], options \\ []), do: request(:head, url, "", headers, options)
-
-  @doc """
-  Performs POST request.
-
-  See `Pleroma.HTTP.request/5`
-  """
-  @spec post(Request.url(), String.t(), Request.headers(), keyword()) ::
-          {:ok, Env.t()} | {:error, any()}
-  def post(url, body, headers \\ [], options \\ []),
-    do: request(:post, url, body, headers, options)
-
-  @doc """
-  Builds and performs http request.
-
-  # Arguments:
-  `method` - :get, :post, :put, :delete, :head
-  `url` - full url
-  `body` - request body
-  `headers` - a keyworld list of headers, e.g. `[{"content-type", "text/plain"}]`
-  `options` - custom, per-request middleware or adapter options
-
-  # Returns:
-  `{:ok, %Tesla.Env{}}` or `{:error, error}`
-
-  """
-  @spec request(method(), Request.url(), String.t(), Request.headers(), keyword()) ::
-          {:ok, Env.t()} | {:error, any()}
-  def request(method, url, body, headers, options) when is_binary(url) do
-    uri = URI.parse(url)
-    adapter_opts = AdapterHelper.options(uri, options[:adapter] || [])
-
-    case AdapterHelper.get_conn(uri, adapter_opts) do
-      {:ok, adapter_opts} ->
-        options = put_in(options[:adapter], adapter_opts)
-        params = options[:params] || []
-        request = build_request(method, headers, options, url, body, params)
-
-        adapter = Application.get_env(:tesla, :adapter)
-
-        client = Tesla.client(adapter_middlewares(adapter), adapter)
-
-        maybe_limit(
-          fn ->
-            request(client, request)
-          end,
-          adapter,
-          adapter_opts
-        )
-
-      # Connection release is handled in a custom FollowRedirects middleware
-      err ->
-        err
-    end
-  end
-
-  @spec request(Client.t(), keyword()) :: {:ok, Env.t()} | {:error, any()}
-  def request(client, request), do: Tesla.request(client, request)
-
-  defp build_request(method, headers, options, url, body, params) do
-    Builder.new()
-    |> Builder.method(method)
-    |> Builder.headers(headers)
-    |> Builder.opts(options)
-    |> Builder.url(url)
-    |> Builder.add_param(:body, :body, body)
-    |> Builder.add_param(:query, :query, params)
-    |> Builder.convert_to_keyword()
-  end
-
-  @prefix Pleroma.Gun.ConnectionPool
-  defp maybe_limit(fun, Tesla.Adapter.Gun, opts) do
-    ConcurrentLimiter.limit(:"#{@prefix}.#{opts[:pool] || :default}", fun)
-  end
-
-  defp maybe_limit(fun, _, _) do
-    fun.()
-  end
-
-  defp adapter_middlewares(Tesla.Adapter.Gun) do
-    [Pleroma.HTTP.Middleware.FollowRedirects]
-  end
-
-  defp adapter_middlewares(_), do: []
-end