Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

[akkoma] / lib / pleroma / web / pleroma_api / views / chat_view.ex

diff --git a/lib/pleroma/web/pleroma_api/views/chat_view.ex b/lib/pleroma/web/pleroma_api/views/chat_view.ex
index 1e9ef4356d9ca473282940146e75a29bf6af346b..91d50dd1e4e94984097cd1c9e2a705a898e9e91b 100644 (file)
--- a/lib/pleroma/web/pleroma_api/views/chat_view.ex
+++ b/lib/pleroma/web/pleroma_api/views/chat_view.ex
@@ -6,17 +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.ChatMessageReferenceView
 
   def render("show.json", %{chat: %Chat{} = chat} = opts) do
     recipient = User.get_cached_by_ap_id(chat.recipient)
 
+    last_message = opts[:last_message] || ChatMessageReference.last_message_for_chat(chat)
+
     %{
       id: chat.id |> to_string(),
-      recipient: chat.recipient,
-      recipient_account: AccountView.render("show.json", Map.put(opts, :user, recipient)),
-      unread: chat.unread
+      account: AccountView.render("show.json", Map.put(opts, :user, recipient)),
+      unread: Map.get(chat, :unread) || ChatMessageReference.unread_count_for_chat(chat),
+      last_message:
+        last_message &&
+          ChatMessageReferenceView.render("show.json", chat_message_reference: last_message),
+      updated_at: Utils.to_masto_date(chat.updated_at)
     }
   end