projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import stable commits into develop after releasing 2.2.0
[akkoma]
/
lib
/
pleroma
/
web
/
pleroma_api
/
views
/
chat
/
message_reference_view.ex
diff --git
a/lib/pleroma/web/pleroma_api/views/chat/message_reference_view.ex
b/lib/pleroma/web/pleroma_api/views/chat/message_reference_view.ex
index f2112a86ed5fbd8f5dcaabd44bb17e726c94e1f7..c058fb340eebf6ab2f3956ee541a883fae7328d1 100644
(file)
--- a/
lib/pleroma/web/pleroma_api/views/chat/message_reference_view.ex
+++ b/
lib/pleroma/web/pleroma_api/views/chat/message_reference_view.ex
@@
-5,6
+5,7
@@
defmodule Pleroma.Web.PleromaAPI.Chat.MessageReferenceView do
use Pleroma.Web, :view
defmodule Pleroma.Web.PleromaAPI.Chat.MessageReferenceView do
use Pleroma.Web, :view
+ alias Pleroma.Maps
alias Pleroma.User
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MastodonAPI.StatusView
alias Pleroma.User
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MastodonAPI.StatusView
@@
-14,7
+15,7
@@
defmodule Pleroma.Web.PleromaAPI.Chat.MessageReferenceView do
%{
chat_message_reference: %{
id: id,
%{
chat_message_reference: %{
id: id,
- object: %{data: chat_message},
+ object: %{data: chat_message}
= object
,
chat_id: chat_id,
unread: unread
}
chat_id: chat_id,
unread: unread
}
@@
-30,8
+31,14
@@
defmodule Pleroma.Web.PleromaAPI.Chat.MessageReferenceView do
attachment:
chat_message["attachment"] &&
StatusView.render("attachment.json", attachment: chat_message["attachment"]),
attachment:
chat_message["attachment"] &&
StatusView.render("attachment.json", attachment: chat_message["attachment"]),
- unread: unread
+ unread: unread,
+ card:
+ StatusView.render(
+ "card.json",
+ Pleroma.Web.RichMedia.Helpers.fetch_data_for_object(object)
+ )
}
}
+ |> put_idempotency_key()
end
def render("index.json", opts) do
end
def render("index.json", opts) do
@@
-42,4
+49,13
@@
defmodule Pleroma.Web.PleromaAPI.Chat.MessageReferenceView do
Map.put(opts, :as, :chat_message_reference)
)
end
Map.put(opts, :as, :chat_message_reference)
)
end
+
+ defp put_idempotency_key(data) do
+ with {:ok, idempotency_key} <- Cachex.get(:chat_message_id_idempotency_key_cache, data.id) do
+ data
+ |> Maps.put_if_present(:idempotency_key, idempotency_key)
+ else
+ _ -> data
+ end
+ end
end
end