mirror of
https://akkoma.dev/AkkomaGang/akkoma.git
synced 2024-11-09 17:55:11 +00:00
Merge pull request 'Reblog content should be ""' (#489) from masto4-reboost into develop
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/489
This commit is contained in:
commit
df03d64dc5
|
@ -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,
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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())
|
||||
|
|
Loading…
Reference in a new issue