diff options
author | lain <lain@soykaf.club> | 2019-04-15 21:58:58 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2019-04-15 21:58:58 +0200 |
commit | 0da985182f26927de0d2d9733816600afb89e79e (patch) | |
tree | ae5fc4d9a180877836e6309faf01d8e016385ae7 /lib | |
parent | c1ebb38d3adc1d222be832405ec0d7497b61f94a (diff) | |
download | pleroma-0da985182f26927de0d2d9733816600afb89e79e.tar.gz pleroma-0da985182f26927de0d2d9733816600afb89e79e.zip |
Conversation: Return full status object, id is a string.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index 57f73dacd..3ffb767b9 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -1590,12 +1590,16 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do conversations = Enum.map(participations, fn participation -> + activity = Activity.get_by_id_with_object(participation.last_activity_id) + + last_status = StatusView.render("status.json", %{activity: activity, for: user}) + %{ - id: participation.id, + id: participation.id |> to_string(), # TODO: Add this. accounts: [], unread: !participation.read, - last_status: participation.last_activity_id + last_status: last_status } end) |