diff options
| author | lambda <pleromagit@rogerbraun.net> | 2019-01-30 20:18:05 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2019-01-30 20:18:05 +0000 |
| commit | 6b54a3ec0bc0fc63db44ce72f8d4fe0f97adc1bc (patch) | |
| tree | d570fd62b3cb526ee17064eed5f750279eb04c1f | |
| parent | 45d22269e7213fecaa753ed0c767781d7a736d9c (diff) | |
| parent | 5ea0397e2d941a95cda9b3c5d8d66cbec9a6b1d6 (diff) | |
| download | pleroma-6b54a3ec0bc0fc63db44ce72f8d4fe0f97adc1bc.tar.gz pleroma-6b54a3ec0bc0fc63db44ce72f8d4fe0f97adc1bc.zip | |
Merge branch 'multiple-hackney-pools' into 'develop'
Fix 4aff4efa typos
See merge request pleroma/pleroma!743
| -rw-r--r-- | lib/pleroma/application.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/rich_media/parser.ex | 2 | ||||
| -rw-r--r-- | 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 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) |