projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 bc3af5ef511853f9dfe10986b0d27e1090b7e062..223b6498717f06349deb526098a9981b7f9a8a1e 100644
(file)
--- a/
lib/pleroma/web/pleroma_api/views/chat_view.ex
+++ b/
lib/pleroma/web/pleroma_api/views/chat_view.ex
@@
-7,15
+7,22
@@
defmodule Pleroma.Web.PleromaAPI.ChatView do
alias Pleroma.Chat
alias Pleroma.User
alias Pleroma.Chat
alias Pleroma.User
+ alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MastodonAPI.AccountView
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)
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)
+
%{
id: chat.id |> to_string(),
account: AccountView.render("show.json", Map.put(opts, :user, recipient)),
%{
id: chat.id |> to_string(),
account: AccountView.render("show.json", Map.put(opts, :user, recipient)),
- unread: chat.unread
+ 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
}
end