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_message_view.ex
diff --git
a/lib/pleroma/web/pleroma_api/views/chat_message_view.ex
b/lib/pleroma/web/pleroma_api/views/chat_message_view.ex
index b40ab92a023cdb605e27aca516283f9c92fdef86..b088a87346fd0cee75b13b30daeb29eb54d43ffd 100644
(file)
--- a/
lib/pleroma/web/pleroma_api/views/chat_message_view.ex
+++ b/
lib/pleroma/web/pleroma_api/views/chat_message_view.ex
@@
-6,6
+6,7
@@
defmodule Pleroma.Web.PleromaAPI.ChatMessageView do
use Pleroma.Web, :view
alias Pleroma.Chat
use Pleroma.Web, :view
alias Pleroma.Chat
+ alias Pleroma.User
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MastodonAPI.StatusView
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MastodonAPI.StatusView
@@
-20,9
+21,12
@@
defmodule Pleroma.Web.PleromaAPI.ChatMessageView do
id: id |> to_string(),
content: chat_message["content"],
chat_id: chat_id |> to_string(),
id: id |> to_string(),
content: chat_message["content"],
chat_id: chat_id |> to_string(),
- ac
tor: chat_message["actor"]
,
+ ac
count_id: User.get_cached_by_ap_id(chat_message["actor"]).id
,
created_at: Utils.to_masto_date(chat_message["published"]),
created_at: Utils.to_masto_date(chat_message["published"]),
- emojis: StatusView.build_emojis(chat_message["emoji"])
+ emojis: StatusView.build_emojis(chat_message["emoji"]),
+ attachment:
+ chat_message["attachment"] &&
+ StatusView.render("attachment.json", attachment: chat_message["attachment"])
}
end
}
end