projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
web
/
rich_media
/
parsers
/
oembed_parser.ex
diff --git
a/lib/pleroma/web/rich_media/parsers/oembed_parser.ex
b/lib/pleroma/web/rich_media/parsers/oembed_parser.ex
index c3adc4962e177c72f86063d16bc127e7d59be90c..2530b8c9d0b29bff8d454c79eeb066b0150d8c2e 100644
(file)
--- 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)