Merge branch 'multiple-hackney-pools' into 'develop'

Fix 4aff4efa typos

See merge request pleroma/pleroma!743

lib/pleroma/application.ex

@@ -132,7 +132,7 @@ defmodule Pleroma.Application do
         []
       end ++
       if Pleroma.Config.get([Pleroma.Uploader, :proxy_remote]) do
-        [:uploadproxy]
+        [:upload]
       else
         []
       end

lib/pleroma/web/rich_media/parser.ex

@@ -28,7 +28,7 @@ defmodule Pleroma.Web.RichMedia.Parser do
 
   defp parse_url(url) do
     try do
-      {:ok, %Tesla.Env{body: html}} = Pleroma.HTTP.get(url, [], pool: :media)
+      {:ok, %Tesla.Env{body: html}} = Pleroma.HTTP.get(url, [], adapter: [pool: :media])
 
       html |> maybe_parse() |> get_parsed_data()
     rescue

lib/pleroma/web/rich_media/parsers/oembed_parser.ex

@@ -20,7 +20,7 @@ defmodule Pleroma.Web.RichMedia.Parsers.OEmbed do
   end
 
   defp get_oembed_data(url) do
-    {:ok, %Tesla.Env{body: json}} = Pleroma.HTTP.get(url, [], pool: :media)
+    {:ok, %Tesla.Env{body: json}} = Pleroma.HTTP.get(url, [], adapter: [pool: :media])
 
     {:ok, data} = Jason.decode(json)