From 0da985182f26927de0d2d9733816600afb89e79e Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Mon, 15 Apr 2019 21:58:58 +0200
Subject: Conversation: Return full status object, id is a string.

---
 lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'lib')

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)
 
-- 
cgit v1.2.3