sjw/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-12-28 17:15:39 +01:00
Code Issues Releases Wiki Activity

ChatView: Add update_at field.

Browse Source
This commit is contained in:
lain 2020-05-14 13:20:28 +02:00
parent 0f0acc740d
commit 3342846ac2
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatView do
alias Pleroma.Chat
alias Pleroma.User
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MastodonAPI.AccountView
alias Pleroma.Web.PleromaAPI.ChatMessageView
@ -20,7 +21,8 @@ defmodule Pleroma.Web.PleromaAPI.ChatView do
account: AccountView.render("show.json", Map.put(opts, :user, recipient)),
unread: chat.unread,
last_message:
last_message && ChatMessageView.render("show.json", chat: chat, object: last_message)
last_message && ChatMessageView.render("show.json", chat: chat, object: last_message),
updated_at: Utils.to_masto_date(chat.updated_at)
}
end

4
test/web/pleroma_api/views/chat_view_test.exs
View File

@ -8,6 +8,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatViewTest do
alias Pleroma.Chat
alias Pleroma.Object
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MastodonAPI.AccountView
alias Pleroma.Web.PleromaAPI.ChatMessageView
alias Pleroma.Web.PleromaAPI.ChatView
@ -26,7 +27,8 @@ defmodule Pleroma.Web.PleromaAPI.ChatViewTest do
id: "#{chat.id}",
account: AccountView.render("show.json", user: recipient),
unread: 0,
last_message: nil
last_message: nil,
updated_at: Utils.to_masto_date(chat.updated_at)
}
{:ok, chat_message_creation} = CommonAPI.post_chat_message(user, recipient, "hello")