srxl/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Pull requests Activity

Merge pull request 'Reblog content should be ""' (#489) from masto4-reboost into develop

Browse source 
Reviewed-on: AkkomaGang/akkoma#489
This commit is contained in:
floatingghost 2023-03-02 11:16:26 +00:00
commit df03d64dc5
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/mastodon_api/views/status_view.ex
View file

@ -183,7 +183,7 @@ def render(
in_reply_to_id: nil, in_reply_to_id: nil,
in_reply_to_account_id: nil, in_reply_to_account_id: nil,
reblog: reblogged, reblog: reblogged,
content: reblogged[:content] || "", content: "",
created_at: created_at, created_at: created_at,
reblogs_count: 0, reblogs_count: 0,
replies_count: 0, replies_count: 0,

2
test/pleroma/web/activity_pub/object_validators/article_note_page_validator_test.exs
View file

@ -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 =~ "@oops_not_a_mention"
assert content =~ 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" assert content =~ "some text<br/>newline"
end end

1
test/pleroma/web/mastodon_api/views/status_view_test.exs
View file

@ -594,6 +594,7 @@ test "a reblog" do
represented = StatusView.render("show.json", %{for: user, activity: reblog}) represented = StatusView.render("show.json", %{for: user, activity: reblog})
assert represented[:id] == to_string(reblog.id) assert represented[:id] == to_string(reblog.id)
assert represented[:content] == ""
assert represented[:reblog][:id] == to_string(activity.id) assert represented[:reblog][:id] == to_string(activity.id)
assert represented[:emojis] == [] assert represented[:emojis] == []
assert_schema(represented, "Status", Pleroma.Web.ApiSpec.spec()) assert_schema(represented, "Status", Pleroma.Web.ApiSpec.spec())