projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'restart-fix-for-mix-tasks' 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 ca7226fafd88f7b21dec7d2da49d479c6d6bc4b8..8f32bf91b3123c16ca683b2902ba5d8c6523d3df 100644
(file)
--- a/
lib/pleroma/web/rich_media/parsers/oembed_parser.ex
+++ b/
lib/pleroma/web/rich_media/parsers/oembed_parser.ex
@@
-1,3
+1,7
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Web.RichMedia.Parsers.OEmbed do
def parse(html, _data) do
with elements = [_ | _] <- get_discovery_data(html),
defmodule Pleroma.Web.RichMedia.Parsers.OEmbed do
def parse(html, _data) do
with elements = [_ | _] <- get_discovery_data(html),
@@
-20,8
+24,12
@@
defmodule Pleroma.Web.RichMedia.Parsers.OEmbed do
end
defp get_oembed_data(url) do
end
defp get_oembed_data(url) do
- {:ok, %Tesla.Env{body: json}} = Pleroma.HTTP.get(url)
+ {:ok, %Tesla.Env{body: json}} = Pleroma.HTTP.get(url, [], adapter: [pool: :media])
+
+ {:ok, data} = Jason.decode(json)
+
+ data = data |> Map.new(fn {k, v} -> {String.to_atom(k), v} end)
- {:ok,
Poison.decode!(json)
}
+ {:ok,
data
}
end
end
end
end