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

Fix 4aff4efa typos

See merge request pleroma/pleroma!743
This commit is contained in:
lambda 2019-01-30 20:18:05 +00:00
commit 6b54a3ec0b
3 changed files with 3 additions and 3 deletions

View file

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

View file

@ -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

View file

@ -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)