diff options
| author | eal <eal@waifu.club> | 2018-06-15 20:43:30 +0000 |
|---|---|---|
| committer | eal <eal@waifu.club> | 2018-06-15 20:43:30 +0000 |
| commit | a938d07df1679efd78e1b7c10e149270489761f7 (patch) | |
| tree | e8ac30d08497f4ed0f2c505a371ad748d776c06d /lib | |
| parent | 00d7d109efd3315cff7e73dfb5b3064bf0dbe25c (diff) | |
| parent | 72c2915ecd0b6578d72b3c9796f4adc8cce83d86 (diff) | |
| download | pleroma-a938d07df1679efd78e1b7c10e149270489761f7.tar.gz | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/status_view.ex | 4 |
1 files changed, 2 insertions, 2 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, |