summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>2018-06-15 21:37:29 +0200
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>2018-06-15 22:14:17 +0200
commit72c2915ecd0b6578d72b3c9796f4adc8cce83d86 (patch)
tree9b1ab0c3899725a36947ee7a09b3b0a3b9386d28
parentde20c8d6208563f50c1f8af9a2ee8b14c7663dad (diff)
downloadpleroma-72c2915ecd0b6578d72b3c9796f4adc8cce83d86.tar.gz
pleroma-72c2915ecd0b6578d72b3c9796f4adc8cce83d86.zip
Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads
-rw-r--r--lib/pleroma/web/mastodon_api/views/status_view.ex4
-rw-r--r--test/web/mastodon_api/status_view_test.exs4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
index d1d48cd0a..59898457b 100644
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -125,8 +125,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
uri: object["id"],
url: object["external_url"] || object["id"],
account: AccountView.render("account.json", %{user: user}),
- in_reply_to_id: reply_to && reply_to.id,
- in_reply_to_account_id: reply_to_user && reply_to_user.id,
+ in_reply_to_id: reply_to && to_string(reply_to.id),
+ in_reply_to_account_id: reply_to_user && to_string(reply_to_user.id),
reblog: nil,
content: HtmlSanitizeEx.basic_html(object["content"]),
created_at: created_at,
diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs
index d9a0a8a95..d28c3cbad 100644
--- a/test/web/mastodon_api/status_view_test.exs
+++ b/test/web/mastodon_api/status_view_test.exs
@@ -64,11 +64,11 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
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})
- assert status.in_reply_to_id == note.id
+ assert status.in_reply_to_id == to_string(note.id)
end
test "contains mentions" do