squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

StreamerView: Actually send Chats, not ChatMessages.

Browse Source
This commit is contained in:
lain 2020-05-29 16:02:45 +02:00
parent 863c02b25d
commit 767ce8b803
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/pleroma_api/views/chat_view.ex
View File

@ -14,7 +14,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatView do
def render("show.json", %{chat: %Chat{} = chat} = opts) do def render("show.json", %{chat: %Chat{} = chat} = opts) do
recipient = User.get_cached_by_ap_id(chat.recipient) 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(),

4
lib/pleroma/web/views/streamer_view.ex
View File

@ -16,9 +16,9 @@ defmodule Pleroma.Web.StreamerView do
chat = Chat.get(user.id, hd(recipients -- [user.ap_id])) chat = Chat.get(user.id, hd(recipients -- [user.ap_id]))
representation = representation =
Pleroma.Web.PleromaAPI.ChatMessageView.render( Pleroma.Web.PleromaAPI.ChatView.render(
"show.json", "show.json",
%{object: object, chat: chat} %{message: object, chat: chat}
) )
%{ %{