Refactor conversation function in MastodonAPIController to use a View
This commit is contained in:
parent
2662bea4e0
commit
e56afefef9
|
@ -22,6 +22,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
|
||||||
alias Pleroma.Web.CommonAPI
|
alias Pleroma.Web.CommonAPI
|
||||||
alias Pleroma.Web.MastodonAPI.AccountView
|
alias Pleroma.Web.MastodonAPI.AccountView
|
||||||
alias Pleroma.Web.MastodonAPI.AppView
|
alias Pleroma.Web.MastodonAPI.AppView
|
||||||
|
alias Pleroma.Web.MastodonAPI.ConversationView
|
||||||
alias Pleroma.Web.MastodonAPI.FilterView
|
alias Pleroma.Web.MastodonAPI.FilterView
|
||||||
alias Pleroma.Web.MastodonAPI.ListView
|
alias Pleroma.Web.MastodonAPI.ListView
|
||||||
alias Pleroma.Web.MastodonAPI.MastodonAPI
|
alias Pleroma.Web.MastodonAPI.MastodonAPI
|
||||||
|
@ -1590,22 +1591,7 @@ def conversations(%{assigns: %{user: user}} = conn, params) do
|
||||||
|
|
||||||
conversations =
|
conversations =
|
||||||
Enum.map(participations, fn participation ->
|
Enum.map(participations, fn participation ->
|
||||||
activity = Activity.get_by_id_with_object(participation.last_activity_id)
|
ConversationView.render("participation.json", %{participation: participation, user: user})
|
||||||
|
|
||||||
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(),
|
|
||||||
accounts: accounts,
|
|
||||||
unread: !participation.read,
|
|
||||||
last_status: last_status
|
|
||||||
}
|
|
||||||
end)
|
end)
|
||||||
|
|
||||||
conn
|
conn
|
||||||
|
@ -1617,31 +1603,11 @@ def conversation_read(%{assigns: %{user: user}} = conn, %{"id" => participation_
|
||||||
with %Participation{} = participation <-
|
with %Participation{} = participation <-
|
||||||
Repo.get_by(Participation, id: participation_id, user_id: user.id),
|
Repo.get_by(Participation, id: participation_id, user_id: user.id),
|
||||||
{:ok, participation} <- Participation.mark_as_read(participation) do
|
{:ok, participation} <- Participation.mark_as_read(participation) do
|
||||||
participation = Repo.preload(participation, conversation: :users)
|
participation_view =
|
||||||
|
ConversationView.render("participation.json", %{participation: participation, user: user})
|
||||||
accounts =
|
|
||||||
AccountView.render("accounts.json", %{
|
|
||||||
users: participation.conversation.users,
|
|
||||||
as: :user
|
|
||||||
})
|
|
||||||
|
|
||||||
last_activity_id =
|
|
||||||
ActivityPub.fetch_latest_activity_id_for_context(participation.conversation.ap_id, %{
|
|
||||||
"user" => user,
|
|
||||||
"blocking_user" => user
|
|
||||||
})
|
|
||||||
|
|
||||||
activity = Activity.get_by_id_with_object(last_activity_id)
|
|
||||||
|
|
||||||
last_status = StatusView.render("status.json", %{activity: activity, for: user})
|
|
||||||
|
|
||||||
conn
|
conn
|
||||||
|> json(%{
|
|> json(participation_view)
|
||||||
id: participation.id,
|
|
||||||
accounts: accounts,
|
|
||||||
unread: !participation.read,
|
|
||||||
last_status: last_status
|
|
||||||
})
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
38
lib/pleroma/web/mastodon_api/views/conversation_view.ex
Normal file
38
lib/pleroma/web/mastodon_api/views/conversation_view.ex
Normal file
|
@ -0,0 +1,38 @@
|
||||||
|
defmodule Pleroma.Web.MastodonAPI.ConversationView do
|
||||||
|
use Pleroma.Web, :view
|
||||||
|
|
||||||
|
alias Pleroma.Activity
|
||||||
|
alias Pleroma.Repo
|
||||||
|
alias Pleroma.Web.ActivityPub.ActivityPub
|
||||||
|
alias Pleroma.Web.MastodonAPI.StatusView
|
||||||
|
alias Pleroma.Web.MastodonAPI.AccountView
|
||||||
|
|
||||||
|
def render("participation.json", %{participation: participation, user: user}) do
|
||||||
|
participation = Repo.preload(participation, conversation: :users)
|
||||||
|
|
||||||
|
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
|
||||||
|
})
|
||||||
|
end
|
||||||
|
|
||||||
|
activity = Activity.get_by_id_with_object(last_activity_id)
|
||||||
|
|
||||||
|
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(),
|
||||||
|
accounts: accounts,
|
||||||
|
unread: !participation.read,
|
||||||
|
last_status: last_status
|
||||||
|
}
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in a new issue