sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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
parent 45d22269e7 5ea0397e2d
commit 6b54a3ec0b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/application.ex
View File

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

2
lib/pleroma/web/rich_media/parser.ex
View File

@ -28,7 +28,7 @@ defmodule Pleroma.Web.RichMedia.Parser do
defp parse_url(url) do defp parse_url(url) do
try 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() html |> maybe_parse() |> get_parsed_data()
rescue rescue

2
lib/pleroma/web/rich_media/parsers/oembed_parser.ex
View File

@ -20,7 +20,7 @@ defmodule Pleroma.Web.RichMedia.Parsers.OEmbed do
end end
defp get_oembed_data(url) do 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) {:ok, data} = Jason.decode(json)