X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fweb%2Fpleroma_api%2Fviews%2Fchat_view.ex;h=91d50dd1e4e94984097cd1c9e2a705a898e9e91b;hb=a8ca030d85368285af1b960e14dab5b847ecb35a;hp=21f0612fff9a0d154fbeaa48e077bc0cb97fb08f;hpb=3cff4e24cd8c56af47b1983ea97ec4643dbc183e;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 21f0612ff..91d50dd1e 100644
--- a/lib/pleroma/web/pleroma_api/views/chat_view.ex
+++ b/lib/pleroma/web/pleroma_api/views/chat_view.ex
@@ -6,21 +6,25 @@ defmodule Pleroma.Web.PleromaAPI.ChatView do
   use Pleroma.Web, :view
 
   alias Pleroma.Chat
+  alias Pleroma.ChatMessageReference
   alias Pleroma.User
+  alias Pleroma.Web.CommonAPI.Utils
   alias Pleroma.Web.MastodonAPI.AccountView
-  alias Pleroma.Web.PleromaAPI.ChatMessageView
+  alias Pleroma.Web.PleromaAPI.ChatMessageReferenceView
 
   def render("show.json", %{chat: %Chat{} = chat} = opts) do
     recipient = User.get_cached_by_ap_id(chat.recipient)
 
-    last_message = Chat.last_message_for_chat(chat)
+    last_message = opts[:last_message] || ChatMessageReference.last_message_for_chat(chat)
 
     %{
       id: chat.id |> to_string(),
       account: AccountView.render("show.json", Map.put(opts, :user, recipient)),
-      unread: chat.unread,
+      unread: Map.get(chat, :unread) || ChatMessageReference.unread_count_for_chat(chat),
       last_message:
-        last_message && ChatMessageView.render("show.json", chat: chat, object: last_message)
+        last_message &&
+          ChatMessageReferenceView.render("show.json", chat_message_reference: last_message),
+      updated_at: Utils.to_masto_date(chat.updated_at)
     }
   end