Conversations: Use 'recipients' for accounts in conversation view.
According to gargron, this is the intended usage.
This commit is contained in:
parent
a2b98f6d58
commit
23c46f7e72
3 changed files with 7 additions and 22 deletions
|
|
@ -12,7 +12,7 @@ defmodule Pleroma.Web.MastodonAPI.ConversationView do
|
|||
alias Pleroma.Web.MastodonAPI.StatusView
|
||||
|
||||
def render("participation.json", %{participation: participation, user: user}) do
|
||||
participation = Repo.preload(participation, conversation: :users, recipients: [])
|
||||
participation = Repo.preload(participation, conversation: [], recipients: [])
|
||||
|
||||
last_activity_id =
|
||||
with nil <- participation.last_activity_id do
|
||||
|
|
@ -28,7 +28,7 @@ defmodule Pleroma.Web.MastodonAPI.ConversationView do
|
|||
|
||||
# Conversations return all users except the current user.
|
||||
users =
|
||||
participation.conversation.users
|
||||
participation.recipients
|
||||
|> Enum.reject(&(&1.id == user.id))
|
||||
|
||||
accounts =
|
||||
|
|
@ -37,20 +37,11 @@ defmodule Pleroma.Web.MastodonAPI.ConversationView do
|
|||
as: :user
|
||||
})
|
||||
|
||||
recipients =
|
||||
AccountView.render("accounts.json", %{
|
||||
users: participation.recipients,
|
||||
as: :user
|
||||
})
|
||||
|
||||
%{
|
||||
id: participation.id |> to_string(),
|
||||
accounts: accounts,
|
||||
unread: !participation.read,
|
||||
last_status: last_status,
|
||||
pleroma: %{
|
||||
recipients: recipients
|
||||
}
|
||||
last_status: last_status
|
||||
}
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue