moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bugfix/mastofe_thread_render' into 'develop' 

lib/pleroma/web/mastodon_api/views/status_view.ex: Fix status.json so it renders threads

See merge request pleroma/pleroma!223
This commit is contained in:
eal 2018-06-15 20:43:30 +00:00
parent 00d7d109ef 72c2915ecd
commit a938d07df1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/web/mastodon_api/views/status_view.ex
View File

@ -125,8 +125,8 @@ def render("status.json", %{activity: %{data: %{"object" => object}} = activity}
uri: object["id"], uri: object["id"],
url: object["external_url"] || object["id"], url: object["external_url"] || object["id"],
account: AccountView.render("account.json", %{user: user}), account: AccountView.render("account.json", %{user: user}),
in_reply_to_id: reply_to && reply_to.id, in_reply_to_id: reply_to && to_string(reply_to.id),
in_reply_to_account_id: reply_to_user && reply_to_user.id, in_reply_to_account_id: reply_to_user && to_string(reply_to_user.id),
reblog: nil, reblog: nil,
content: HtmlSanitizeEx.basic_html(object["content"]), content: HtmlSanitizeEx.basic_html(object["content"]),
created_at: created_at, created_at: created_at,

4
test/web/mastodon_api/status_view_test.exs
View File

@ -64,11 +64,11 @@ test "a reply" do
status = StatusView.render("status.json", %{activity: activity}) status = StatusView.render("status.json", %{activity: activity})
assert status.in_reply_to_id == note.id assert status.in_reply_to_id == to_string(note.id)
[status] = StatusView.render("index.json", %{activities: [activity], as: :activity}) [status] = StatusView.render("index.json", %{activities: [activity], as: :activity})
assert status.in_reply_to_id == note.id assert status.in_reply_to_id == to_string(note.id)
end end
test "contains mentions" do test "contains mentions" do