alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rich media: oembed: return data in the same format as the other parsers

This commit is contained in:
William Pitcock 2019-01-28 21:07:36 +00:00
parent ddb5545202
commit 61d6715714
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,10 @@ defp get_oembed_url(nodes) do
defp get_oembed_data(url) do defp get_oembed_data(url) do
{:ok, %Tesla.Env{body: json}} = Pleroma.HTTP.get(url) {:ok, %Tesla.Env{body: json}} = Pleroma.HTTP.get(url)
{:ok, Poison.decode!(json)} {:ok, data} = Jason.decode(json)
data = data |> Map.new(fn {k, v} -> {String.to_atom(k), v} end)
{:ok, data}
end end
end end

41
test/web/rich_media/parser_test.exs
View File

@ -65,28 +65,27 @@ test "parses OEmbed" do
assert Pleroma.Web.RichMedia.Parser.parse("http://example.com/oembed") == assert Pleroma.Web.RichMedia.Parser.parse("http://example.com/oembed") ==
{:ok, {:ok,
%{ %{
"author_name" => "‮‭‬bees‬", author_name: "‮‭‬bees‬",
"author_url" => "https://www.flickr.com/photos/bees/", author_url: "https://www.flickr.com/photos/bees/",
"cache_age" => 3600, cache_age: 3600,
"flickr_type" => "photo", flickr_type: "photo",
"height" => "768", height: "768",
"html" => html:
"<a data-flickr-embed=\"true\" href=\"https://www.flickr.com/photos/bees/2362225867/\" title=\"Bacon Lollys by ‮‭‬bees‬, on Flickr\"><img src=\"https://farm4.staticflickr.com/3040/2362225867_4a87ab8baf_b.jpg\" width=\"1024\" height=\"768\" alt=\"Bacon Lollys\"></a><script async src=\"https://embedr.flickr.com/assets/client-code.js\" charset=\"utf-8\"></script>", "<a data-flickr-embed=\"true\" href=\"https://www.flickr.com/photos/bees/2362225867/\" title=\"Bacon Lollys by ‮‭‬bees‬, on Flickr\"><img src=\"https://farm4.staticflickr.com/3040/2362225867_4a87ab8baf_b.jpg\" width=\"1024\" height=\"768\" alt=\"Bacon Lollys\"></a><script async src=\"https://embedr.flickr.com/assets/client-code.js\" charset=\"utf-8\"></script>",
"license" => "All Rights Reserved", license: "All Rights Reserved",
"license_id" => 0, license_id: 0,
"provider_name" => "Flickr", provider_name: "Flickr",
"provider_url" => "https://www.flickr.com/", provider_url: "https://www.flickr.com/",
"thumbnail_height" => 150, thumbnail_height: 150,
"thumbnail_url" => thumbnail_url: "https://farm4.staticflickr.com/3040/2362225867_4a87ab8baf_q.jpg",
"https://farm4.staticflickr.com/3040/2362225867_4a87ab8baf_q.jpg", thumbnail_width: 150,
"thumbnail_width" => 150, title: "Bacon Lollys",
"title" => "Bacon Lollys", type: "photo",
"type" => "photo", url: "https://farm4.staticflickr.com/3040/2362225867_4a87ab8baf_b.jpg",
"url" => "https://farm4.staticflickr.com/3040/2362225867_4a87ab8baf_b.jpg", version: "1.0",
"version" => "1.0", web_page: "https://www.flickr.com/photos/bees/2362225867/",
"web_page" => "https://www.flickr.com/photos/bees/2362225867/", web_page_short_url: "https://flic.kr/p/4AK2sc",
"web_page_short_url" => "https://flic.kr/p/4AK2sc", width: "1024"
"width" => "1024"
}} }}
end end
end end