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 index 17e80fa92..e11335170 100644 --- 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 @@ -86,7 +86,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.ArticleNotePageValidator do %{"source" => %{"mediaType" => "text/x.misskeymarkdown", "content" => content}} = object ) do {linked, _, _} = Utils.format_input(content, "text/x.misskeymarkdown") - put_in(object, ["source", "content"], linked) + Map.put(object, "content", linked) end defp fix_misskey_content(%{"_misskey_content" => content} = object) do @@ -94,9 +94,10 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.ArticleNotePageValidator do object |> Map.put("source", %{ - "content" => linked, + "content" => content, "mediaType" => "text/x.misskeymarkdown" }) + |> Map.put("content", linked) |> Map.delete("_misskey_content") 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 index 7d424efb6..62526d952 100644 --- 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 @@ -86,7 +86,11 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.ArticleNotePageValidatorTest %{ valid?: true, changes: %{ - source: %{"content" => ^expected_content, "mediaType" => "text/x.misskeymarkdown"} + content: ^expected_content, + source: %{ + "content" => "@akkoma_user linkifylink #dancedance $[jelly mfm goes here] \n\n## aaa", + "mediaType" => "text/x.misskeymarkdown" + } } } = ArticleNotePageValidator.cast_and_validate(note) end @@ -107,7 +111,11 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.ArticleNotePageValidatorTest %{ valid?: true, changes: %{ - source: %{"content" => ^expected_content, "mediaType" => "text/x.misskeymarkdown"} + content: ^expected_content, + source: %{ + "content" => "@akkoma_user linkifylink #dancedance $[jelly mfm goes here] \n\n## aaa", + "mediaType" => "text/x.misskeymarkdown" + } } } = ArticleNotePageValidator.cast_and_validate(note) end