Page MenuHomePhorge

No OneTemporary

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None
diff --git a/changelog.d/rich-media-oembed-image.fix b/changelog.d/rich-media-oembed-image.fix
new file mode 100644
index 000000000..47435a5fa
--- /dev/null
+++ b/changelog.d/rich-media-oembed-image.fix
@@ -0,0 +1 @@
+Rich media: use the oEmbed thumbnail as the card image
diff --git a/lib/pleroma/web/rich_media/parsers/o_embed.ex b/lib/pleroma/web/rich_media/parsers/o_embed.ex
index 3a8e6c80e..8fffe1d0e 100644
--- a/lib/pleroma/web/rich_media/parsers/o_embed.ex
+++ b/lib/pleroma/web/rich_media/parsers/o_embed.ex
@@ -7,8 +7,8 @@ defmodule Pleroma.Web.RichMedia.Parsers.OEmbed do
with elements = [_ | _] <- get_discovery_data(html),
oembed_url when is_binary(oembed_url) <- get_oembed_url(elements),
:ok <- Pleroma.Web.RichMedia.Helpers.validate_page_url(oembed_url),
- {:ok, oembed_data = %{"html" => html}} <- get_oembed_data(oembed_url) do
- %{oembed_data | "html" => Pleroma.HTML.filter_tags(html)}
+ {:ok, oembed_data} <- get_oembed_data(oembed_url) do
+ oembed_data
else
_e -> %{}
end
@@ -23,8 +23,19 @@ defmodule Pleroma.Web.RichMedia.Parsers.OEmbed do
end
defp get_oembed_data(url) do
- with {:ok, json} <- Pleroma.Web.RichMedia.Helpers.rich_media_get(url, accept: :json) do
- Jason.decode(json)
+ with {:ok, json} <- Pleroma.Web.RichMedia.Helpers.rich_media_get(url, accept: :json),
+ {:ok, %{"html" => html} = data} <- Jason.decode(json) do
+ {:ok,
+ data
+ |> Map.put("html", Pleroma.HTML.filter_tags(html))
+ |> put_image()}
+ else
+ _ -> :error
end
end
+
+ defp put_image(%{"thumbnail_url" => url} = data) when is_binary(url),
+ do: Map.put_new(data, "image", url)
+
+ defp put_image(data), do: data
end
diff --git a/test/pleroma/web/rich_media/parser_test.exs b/test/pleroma/web/rich_media/parser_test.exs
index 48b1cbf9a..d516193ec 100644
--- a/test/pleroma/web/rich_media/parser_test.exs
+++ b/test/pleroma/web/rich_media/parser_test.exs
@@ -77,6 +77,7 @@ defmodule Pleroma.Web.RichMedia.ParserTest do
"cache_age" => 3600,
"flickr_type" => "photo",
"height" => "768",
+ "image" => "https://farm4.staticflickr.com/3040/2362225867_4a87ab8baf_q.jpg",
"html" =>
"<a href=\"https://www.flickr.com/photos/bees/2362225867/\" title=\"Bacon Lollys by \u202E\u202D\u202Cbees\u202C, on Flickr\"><img src=\"https://farm4.staticflickr.com/3040/2362225867_4a87ab8baf_b.jpg\" width=\"1024\" height=\"768\" alt=\"Bacon Lollys\"/></a>",
"license" => "All Rights Reserved",

File Metadata

Mime Type
text/x-diff
Expires
Tue, Nov 17, 8:54 PM (15 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1839803
Default Alt Text
(2 KB)

Event Timeline