mirror of
https://git.pleroma.social/sjw/pleroma.git
synced 2024-12-23 11:15:05 +01:00
Conversation: Add accounts to output.
This commit is contained in:
parent
0da985182f
commit
76999c73a7
@ -13,6 +13,7 @@ defmodule Pleroma.Conversation do
|
||||
# This is the context ap id.
|
||||
field(:ap_id, :string)
|
||||
has_many(:participations, Participation)
|
||||
has_many(:users, through: [:participations, :user])
|
||||
|
||||
timestamps()
|
||||
end
|
||||
|
@ -60,6 +60,7 @@ defmodule Pleroma.Conversation.Participation do
|
||||
order_by: [desc: p.updated_at]
|
||||
)
|
||||
|> Pleroma.Pagination.fetch_paginated(params)
|
||||
|> Repo.preload(conversation: [:users])
|
||||
end
|
||||
|
||||
def for_user_with_last_activity_id(user, params \\ %{}) do
|
||||
|
@ -1594,10 +1594,15 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
|
||||
|
||||
last_status = StatusView.render("status.json", %{activity: activity, for: user})
|
||||
|
||||
accounts =
|
||||
AccountView.render("accounts.json", %{
|
||||
users: participation.conversation.users,
|
||||
as: :user
|
||||
})
|
||||
|
||||
%{
|
||||
id: participation.id |> to_string(),
|
||||
# TODO: Add this.
|
||||
accounts: [],
|
||||
accounts: accounts,
|
||||
unread: !participation.read,
|
||||
last_status: last_status
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ defmodule Pleroma.ConversationTest do
|
||||
|
||||
conversation_three =
|
||||
Conversation.get_for_ap_id(context)
|
||||
|> Repo.preload(:participations)
|
||||
|> Repo.preload([:participations, :users])
|
||||
|
||||
assert conversation_three.id == conversation.id
|
||||
|
||||
@ -100,5 +100,17 @@ defmodule Pleroma.ConversationTest do
|
||||
assert Enum.find(conversation_three.participations, fn %{user_id: user_id} ->
|
||||
tridi.id == user_id
|
||||
end)
|
||||
|
||||
assert Enum.find(conversation_three.users, fn %{id: user_id} ->
|
||||
har.id == user_id
|
||||
end)
|
||||
|
||||
assert Enum.find(conversation_three.users, fn %{id: user_id} ->
|
||||
jafnhar.id == user_id
|
||||
end)
|
||||
|
||||
assert Enum.find(conversation_three.users, fn %{id: user_id} ->
|
||||
tridi.id == user_id
|
||||
end)
|
||||
end
|
||||
end
|
||||
|
@ -334,6 +334,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
|
||||
}
|
||||
] = response
|
||||
|
||||
assert length(res_accounts) == 2
|
||||
assert is_binary(res_id)
|
||||
assert unread == true
|
||||
assert res_last_status["id"] == direct.id
|
||||
|
Loading…
Reference in New Issue
Block a user