Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy

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

defmodule Pleroma.HTTP do
  use HTTPoison.Base

  def process_request_options(options) do
    config = Application.get_env(:pleroma, :http, [])
    proxy = Keyword.get(config, :proxy_url, "")
    case proxy do
      "" -> options
      _ -> options ++ [proxy: proxy]
    end
  end

end