From: href <href@random.sh>
Date: Wed, 30 Jan 2019 20:08:41 +0000 (+0100)
Subject: Fix 4aff4efa typos
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=5ea0397e2d941a95cda9b3c5d8d66cbec9a6b1d6;p=akkoma

Fix 4aff4efa typos
---

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index f775cd53d..40bff08c7 100644
--- 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
index 874e8c5e6..e67ecc47d 100644
--- 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
index c3adc4962..2530b8c9d 100644
--- 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)