pleroma

commit: ac0882e3483d6ad4d82e9a9ce88c80933bf9efe6
parent 2137b681dc9d2643aaee0698fe6e99167691c573
Author: Mark Felder <feld@feld.me>
Date:   Fri, 28 Feb 2025 16:12:22 -0800

Filter the parsed OpenGraph/Twittercard tags and only retain the ones we intend to use.

Diffstat:
A
changelog.d/rich-media-twittercard.fix
1
+
M
lib/pleroma/web/rich_media/parsers/twitter_card.ex
11
+++++++++++
M
test/pleroma/web/rich_media/parser_test.exs
1
-
M
test/pleroma/web/rich_media/parsers/twitter_card_test.exs
18
+-----------------

4 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/changelog.d/rich-media-twittercard.fix b/changelog.d/rich-media-twittercard.fix
@@ -0,0 +1 @@
+Fix Rich Media parsing of TwitterCards/OpenGraph to adhere to the spec and always choose the first image if multiple are provided.
diff --git a/lib/pleroma/web/rich_media/parsers/twitter_card.ex b/lib/pleroma/web/rich_media/parsers/twitter_card.ex
@@ -11,5 +11,16 @@ defmodule Pleroma.Web.RichMedia.Parsers.TwitterCard do
     |> MetaTagsParser.parse(html, "og", "property")
     |> MetaTagsParser.parse(html, "twitter", "name")
     |> MetaTagsParser.parse(html, "twitter", "property")
+    |> filter_tags()
+  end
+
+  defp filter_tags(tags) do
+    Map.filter(tags, fn {k, _v} ->
+      cond do
+        k in ["card", "description", "image", "title", "ttl", "type", "url"] -> true
+        String.starts_with?(k, "image:") -> true
+        true -> false
+      end
+    end)
   end
 end
diff --git a/test/pleroma/web/rich_media/parser_test.exs b/test/pleroma/web/rich_media/parser_test.exs
@@ -54,7 +54,6 @@ defmodule Pleroma.Web.RichMedia.ParserTest do
              {:ok,
               %{
                 "card" => "summary",
-                "site" => "@flickr",
                 "image" => "https://farm6.staticflickr.com/5510/14338202952_93595258ff_z.jpg",
                 "title" => "Small Island Developing States Photo Submission",
                 "description" => "View the album on Flickr.",
diff --git a/test/pleroma/web/rich_media/parsers/twitter_card_test.exs b/test/pleroma/web/rich_media/parsers/twitter_card_test.exs
@@ -17,10 +17,6 @@ defmodule Pleroma.Web.RichMedia.Parsers.TwitterCardTest do
 
     assert TwitterCard.parse(html, %{}) ==
              %{
-               "app:id:googleplay" => "com.nytimes.android",
-               "app:name:googleplay" => "NYTimes",
-               "app:url:googleplay" => "nytimes://reader/id/100000006583622",
-               "site" => nil,
                "description" =>
                  "With little oversight, the N.Y.P.D. has been using powerful surveillance technology on photos of children and teenagers.",
                "image" =>
@@ -61,16 +57,12 @@ defmodule Pleroma.Web.RichMedia.Parsers.TwitterCardTest do
 
     assert TwitterCard.parse(html, %{}) ==
              %{
-               "app:id:googleplay" => "com.nytimes.android",
-               "app:name:googleplay" => "NYTimes",
-               "app:url:googleplay" => "nytimes://reader/id/100000006583622",
                "card" => "summary_large_image",
                "description" =>
                  "With little oversight, the N.Y.P.D. has been using powerful surveillance technology on photos of children and teenagers.",
                "image" =>
                  "https://static01.nyt.com/images/2019/08/01/nyregion/01nypd-juveniles-promo/01nypd-juveniles-promo-facebookJumbo.jpg",
                "image:alt" => "",
-               "site" => nil,
                "title" =>
                  "She Was Arrested at 14. Then Her Photo Went to a Facial Recognition Database.",
                "url" =>
@@ -90,13 +82,11 @@ defmodule Pleroma.Web.RichMedia.Parsers.TwitterCardTest do
 
     assert TwitterCard.parse(html, %{}) ==
              %{
-               "site" => "@atlasobscura",
                "title" => "The Missing Grave of Margaret Corbin, Revolutionary War Veteran",
                "card" => "summary_large_image",
                "image" => image_path,
                "description" =>
                  "She's the only woman veteran honored with a monument at West Point. But where was she buried?",
-               "site_name" => "Atlas Obscura",
                "type" => "article",
                "url" => "http://www.atlasobscura.com/articles/margaret-corbin-grave-west-point"
              }
@@ -109,12 +99,8 @@ defmodule Pleroma.Web.RichMedia.Parsers.TwitterCardTest do
 
     assert TwitterCard.parse(html, %{}) ==
              %{
-               "site" => nil,
                "title" =>
                  "She Was Arrested at 14. Then Her Photo Went to a Facial Recognition Database.",
-               "app:id:googleplay" => "com.nytimes.android",
-               "app:name:googleplay" => "NYTimes",
-               "app:url:googleplay" => "nytimes://reader/id/100000006583622",
                "description" =>
                  "With little oversight, the N.Y.P.D. has been using powerful surveillance technology on photos of children and teenagers.",
                "image" =>
@@ -140,9 +126,7 @@ defmodule Pleroma.Web.RichMedia.Parsers.TwitterCardTest do
                "image:alt" =>
                  "Meze de arbaro kuŝas falinta trunko, sen pingloj kaj kun branĉoj derompitaj. Post ĝi videblas du feoj: florofeo maldekstre kaj nubofeo dekstre. La florofeo iom kaŝas sin post la trunko. La nubofeo staras kaj tenas amason da pigloj. Ili iom rigardas al si.",
                "image:height" => "630",
-               "image:width" => "1200",
-               "locale" => "eo",
-               "site_name" => "Tiriftejo"
+               "image:width" => "1200"
              }
   end
 end