X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fweb%2Fpleroma_api%2Fviews%2Fchat_view.ex;h=223b6498717f06349deb526098a9981b7f9a8a1e;hb=8ff342582839259f3b8e039c6b3da3c0cf798a1f;hp=7b8c6450a5c25febb4a1a855bb3e8b849f98b2b7;hpb=f8c3ae7a627817789776f11497041445bb273c19;p=akkoma

diff --git a/lib/pleroma/web/pleroma_api/views/chat_view.ex b/lib/pleroma/web/pleroma_api/views/chat_view.ex
index 7b8c6450a..223b64987 100644
--- a/lib/pleroma/web/pleroma_api/views/chat_view.ex
+++ b/lib/pleroma/web/pleroma_api/views/chat_view.ex
@@ -6,12 +6,23 @@ defmodule Pleroma.Web.PleromaAPI.ChatView do
   use Pleroma.Web, :view
 
   alias Pleroma.Chat
+  alias Pleroma.User
+  alias Pleroma.Web.CommonAPI.Utils
+  alias Pleroma.Web.MastodonAPI.AccountView
+  alias Pleroma.Web.PleromaAPI.ChatMessageView
+
+  def render("show.json", %{chat: %Chat{} = chat} = opts) do
+    recipient = User.get_cached_by_ap_id(chat.recipient)
+
+    last_message = opts[:message] || Chat.last_message_for_chat(chat)
 
-  def render("show.json", %{chat: %Chat{} = chat}) do
     %{
       id: chat.id |> to_string(),
-      recipient: chat.recipient,
-      unread: chat.unread
+      account: AccountView.render("show.json", Map.put(opts, :user, recipient)),
+      unread: chat.unread,
+      last_message:
+        last_message && ChatMessageView.render("show.json", chat: chat, object: last_message),
+      updated_at: Utils.to_masto_date(chat.updated_at)
     }
   end