projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finish undoing API breakage
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
conversation_view.ex
diff --git
a/lib/pleroma/web/mastodon_api/views/conversation_view.ex
b/lib/pleroma/web/mastodon_api/views/conversation_view.ex
index 2b6f84c72bbea703236178cb8c78f2f93eb13c05..a91994915facbf3c01afa39383f35e0881ecda1e 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/conversation_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/conversation_view.ex
@@
-23,10
+23,13
@@
defmodule Pleroma.Web.MastodonAPI.ConversationView do
last_activity_id =
with nil <- participation.last_activity_id do
last_activity_id =
with nil <- participation.last_activity_id do
- ActivityPub.fetch_latest_activity_id_for_context(participation.conversation.ap_id, %{
- "user" => user,
- "blocking_user" => user
- })
+ ActivityPub.fetch_latest_direct_activity_id_for_context(
+ participation.conversation.ap_id,
+ %{
+ user: user,
+ blocking_user: user
+ }
+ )
end
activity = Activity.get_by_id_with_object(last_activity_id)
end
activity = Activity.get_by_id_with_object(last_activity_id)
@@
-35,7
+38,7
@@
defmodule Pleroma.Web.MastodonAPI.ConversationView do
%{
id: participation.id |> to_string(),
%{
id: participation.id |> to_string(),
- accounts: render(AccountView, "index.json", users: users,
as: :
user),
+ accounts: render(AccountView, "index.json", users: users,
for:
user),
unread: !participation.read,
last_status:
render(StatusView, "show.json",
unread: !participation.read,
last_status:
render(StatusView, "show.json",