pleroma

commit: 6b54a3ec0bc0fc63db44ce72f8d4fe0f97adc1bc
parent: 45d22269e7213fecaa753ed0c767781d7a736d9c
Author: lambda <pleromagit@rogerbraun.net>
Date:   Wed, 30 Jan 2019 20:18:05 +0000

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

Fix 4aff4efa typos

See merge request pleroma/pleroma!743
Diffstat:
M
lib/pleroma/application.ex
2
+-
M
lib/pleroma/web/rich_media/parser.ex
2
+-
M
lib/pleroma/web/rich_media/parsers/oembed_parser.ex
2
+-

3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/pleroma/application.ex b/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
diff --git a/lib/pleroma/web/rich_media/parser.ex b/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
diff --git a/lib/pleroma/web/rich_media/parsers/oembed_parser.ex b/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)