From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Thu, 2 Mar 2023 11:04:27 +0000 (+0000)
Subject: Reblog content should be ""
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;ds=inline;h=b88e6560e0775aa15e47fd50e34fe9dfc0c1ae80;hp=45a11aa20ff9dd1909ec5bee54abcafbf50f4c6f;p=akkoma

Reblog content should be ""

Fixes #450
---

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 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
       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 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.ArticleNotePageValidatorTest
       assert content =~ "@oops_not_a_mention"
 
       assert content =~
-               "<span class=\"mfm _mfm_jelly_\" style=\"display: inline-block; animation: 1s linear 0s infinite normal both running mfm-rubberBand;\">mfm goes here</span> </p>aaa"
+               "<span class=\"mfm _mfm_jelly_\">mfm goes here</span> </p>aaa"
 
       assert content =~ "some text<br/>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 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest 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())