pleroma

commit: 058f8acb586b832864b9c3912970f4072aaea255
parent e4a6973e0b9ffdb827b71012f0b44ed4d870d56a
Author: feld <feld@feld.me>
Date:   Sun, 21 Jul 2024 04:33:34 +0000

Merge branch 'metadata/parsing-empty' into 'develop'

Fix Metadata providers when parsing objects with no content or summary

See merge request pleroma/pleroma!4188
Diffstat:
A
changelog.d/metadata-provider-empty-post.fix
1
+
M
lib/pleroma/web/metadata/utils.ex
5
++++-
M
test/pleroma/web/metadata/utils_test.exs
28
++++++++++++++++++++++------

3 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/changelog.d/metadata-provider-empty-post.fix b/changelog.d/metadata-provider-empty-post.fix
@@ -0,0 +1 @@
+Fix OpenGraph and Twitter metadata providers when parsing objects with no content or summary fields.
diff --git a/lib/pleroma/web/metadata/utils.ex b/lib/pleroma/web/metadata/utils.ex
@@ -25,11 +25,14 @@ defmodule Pleroma.Web.Metadata.Utils do
     |> scrub_html_and_truncate_object_field(object)
   end
 
-  def scrub_html_and_truncate(%{data: %{"content" => content}} = object) do
+  def scrub_html_and_truncate(%{data: %{"content" => content}} = object)
+      when is_binary(content) and content != "" do
     content
     |> scrub_html_and_truncate_object_field(object)
   end
 
+  def scrub_html_and_truncate(%{}), do: ""
+
   def scrub_html_and_truncate(content, max_length \\ 200, omission \\ "...")
       when is_binary(content) do
     content
diff --git a/test/pleroma/web/metadata/utils_test.exs b/test/pleroma/web/metadata/utils_test.exs
@@ -8,7 +8,7 @@ defmodule Pleroma.Web.Metadata.UtilsTest do
   alias Pleroma.Web.Metadata.Utils
 
   describe "scrub_html_and_truncate/1" do
-    test "it returns content text without encode HTML if summary is nil" do
+    test "it returns content text without HTML if summary is nil" do
       user = insert(:user)
 
       note =
@@ -17,14 +17,14 @@ defmodule Pleroma.Web.Metadata.UtilsTest do
             "actor" => user.ap_id,
             "id" => "https://pleroma.gov/objects/whatever",
             "summary" => nil,
-            "content" => "Pleroma's really cool!"
+            "content" => "Pleroma's really cool!<br>"
           }
         })
 
       assert Utils.scrub_html_and_truncate(note) == "Pleroma's really cool!"
     end
 
-    test "it returns context text without encode HTML if summary is empty" do
+    test "it returns content text without HTML if summary is empty" do
       user = insert(:user)
 
       note =
@@ -33,14 +33,14 @@ defmodule Pleroma.Web.Metadata.UtilsTest do
             "actor" => user.ap_id,
             "id" => "https://pleroma.gov/objects/whatever",
             "summary" => "",
-            "content" => "Pleroma's really cool!"
+            "content" => "Pleroma's really cool!<br>"
           }
         })
 
       assert Utils.scrub_html_and_truncate(note) == "Pleroma's really cool!"
     end
 
-    test "it returns summary text without encode HTML if summary is filled" do
+    test "it returns summary text without HTML if summary is filled" do
       user = insert(:user)
 
       note =
@@ -48,7 +48,7 @@ defmodule Pleroma.Web.Metadata.UtilsTest do
           data: %{
             "actor" => user.ap_id,
             "id" => "https://pleroma.gov/objects/whatever",
-            "summary" => "Public service announcement on caffeine consumption",
+            "summary" => "Public service announcement on caffeine consumption<br>",
             "content" => "cofe"
           }
         })
@@ -57,6 +57,22 @@ defmodule Pleroma.Web.Metadata.UtilsTest do
                "Public service announcement on caffeine consumption"
     end
 
+    test "it returns empty string if summary and content are absent" do
+      user = insert(:user)
+
+      note =
+        insert(:note, %{
+          data: %{
+            "actor" => user.ap_id,
+            "id" => "https://pleroma.gov/objects/whatever",
+            "content" => nil,
+            "summary" => nil
+          }
+        })
+
+      assert Utils.scrub_html_and_truncate(note) == ""
+    end
+
     test "it does not return old content after editing" do
       user = insert(:user)