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 08d5110c3ef954c8c28ec695c6f8b402d308e335..223b6498717f06349deb526098a9981b7f9a8a1e 100644
(file)
--- a/
lib/pleroma/web/pleroma_api/views/chat_view.ex
+++ b/
lib/pleroma/web/pleroma_api/views/chat_view.ex
@@
-14,7
+14,7
@@
defmodule Pleroma.Web.PleromaAPI.ChatView do
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 = Chat.last_message_for_chat(chat)
+ last_message =
opts[:message] ||
Chat.last_message_for_chat(chat)
%{
id: chat.id |> to_string(),
%{
id: chat.id |> to_string(),