pleroma

commit: 795736af16dca77929725e7dd55f5de04a796fdb
parent 7deda1fa18cb95a588ba66950ac45262c467a7f4
Author: Alex Gleason <alex@alexgleason.me>
Date:   Sat, 22 Jan 2022 18:03:22 -0600

ObjectValidators: improve quoteUrl compatibility

Diffstat:
M
lib/pleroma/web/activity_pub/object_validators/article_note_page_validator.ex
16
++++++++++++++++
M
test/pleroma/web/activity_pub/object_validators/article_note_page_validator_test.exs
20
++++++++++++++++++++

2 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/lib/pleroma/web/activity_pub/object_validators/article_note_page_validator.ex b/lib/pleroma/web/activity_pub/object_validators/article_note_page_validator.ex
@@ -76,6 +76,21 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.ArticleNotePageValidator do
 
   def fix_attachments(data), do: data
 
+  defp fix_quote_url(%{"quoteUrl" => _quote_url} = data), do: data
+
+  # Fix for Fedibird
+  # https://github.com/fedibird/mastodon/issues/9
+  defp fix_quote_url(%{"quoteURL" => quote_url} = data) do
+    Map.put(data, "quoteUrl", quote_url)
+  end
+
+  # Misskey fallback
+  defp fix_quote_url(%{"_misskey_quote" => quote_url} = data) do
+    Map.put(data, "quoteUrl", quote_url)
+  end
+
+  defp fix_quote_url(data), do: data
+
   defp fix(data) do
     data
     |> CommonFixes.fix_actor()
@@ -84,6 +99,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.ArticleNotePageValidator do
     |> fix_tag()
     |> fix_replies()
     |> fix_attachments()
+    |> fix_quote_url()
     |> Transmogrifier.fix_emoji()
     |> Transmogrifier.fix_content_map()
   end
diff --git a/test/pleroma/web/activity_pub/object_validators/article_note_page_validator_test.exs b/test/pleroma/web/activity_pub/object_validators/article_note_page_validator_test.exs
@@ -116,4 +116,24 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.ArticleNotePageValidatorTest 
 
     %{valid?: true} = ArticleNotePageValidator.cast_and_validate(note)
   end
+
+  test "Fedibird quote post" do
+    insert(:user, ap_id: "https://fedibird.com/users/noellabo")
+
+    data = File.read!("test/fixtures/quote_post/fedibird_quote_post.json") |> Jason.decode!()
+    chg = ArticleNotePageValidator.cast_and_validate(data)
+
+    assert chg.valid?
+    assert chg.changes.quoteUrl == "https://misskey.io/notes/8vsn2izjwh"
+  end
+
+  test "Misskey quote post" do
+    insert(:user, ap_id: "https://misskey.io/users/7rkrarq81i")
+
+    data = File.read!("test/fixtures/quote_post/misskey_quote_post.json") |> Jason.decode!()
+    chg = ArticleNotePageValidator.cast_and_validate(data)
+
+    assert chg.valid?
+    assert chg.changes.quoteUrl == "https://misskey.io/notes/8vs6wxufd0"
+  end
 end