From b88e6560e0775aa15e47fd50e34fe9dfc0c1ae80 Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Thu, 2 Mar 2023 11:04:27 +0000 Subject: [PATCH] Reblog content should be "" Fixes #450 --- lib/pleroma/web/mastodon_api/views/status_view.ex | 2 +- .../object_validators/article_note_page_validator_test.exs | 2 +- test/pleroma/web/mastodon_api/views/status_view_test.exs | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex index 48756e78b..79438571c 100644 --- a/lib/pleroma/web/mastodon_api/views/status_view.ex +++ b/lib/pleroma/web/mastodon_api/views/status_view.ex @@ -183,7 +183,7 @@ def render( in_reply_to_id: nil, in_reply_to_account_id: nil, reblog: reblogged, - content: reblogged[:content] || "", + content: "", created_at: created_at, reblogs_count: 0, replies_count: 0, 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 523a17c17..f1aee27d4 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 @@ -135,7 +135,7 @@ test "a misskey MFM status with a content field should work and be linked", _ do assert content =~ "@oops_not_a_mention" assert content =~ - "mfm goes here

aaa" + "mfm goes here

aaa" assert content =~ "some text
newline" end diff --git a/test/pleroma/web/mastodon_api/views/status_view_test.exs b/test/pleroma/web/mastodon_api/views/status_view_test.exs index b3f0a1781..682c633f4 100644 --- a/test/pleroma/web/mastodon_api/views/status_view_test.exs +++ b/test/pleroma/web/mastodon_api/views/status_view_test.exs @@ -594,6 +594,7 @@ test "a reblog" do represented = StatusView.render("show.json", %{for: user, activity: reblog}) assert represented[:id] == to_string(reblog.id) + assert represented[:content] == "" assert represented[:reblog][:id] == to_string(activity.id) assert represented[:emojis] == [] assert_schema(represented, "Status", Pleroma.Web.ApiSpec.spec())