Participations: Add last activity.
This commit is contained in:
parent
20d9b90760
commit
cf353514fe
@ -7,6 +7,7 @@ defmodule Pleroma.Conversation.Participation do
|
|||||||
alias Pleroma.User
|
alias Pleroma.User
|
||||||
alias Pleroma.Conversation
|
alias Pleroma.Conversation
|
||||||
alias Pleroma.Repo
|
alias Pleroma.Repo
|
||||||
|
alias Pleroma.Web.ActivityPub.ActivityPub
|
||||||
import Ecto.Changeset
|
import Ecto.Changeset
|
||||||
import Ecto.Query
|
import Ecto.Query
|
||||||
|
|
||||||
@ -14,6 +15,7 @@ defmodule Pleroma.Conversation.Participation do
|
|||||||
belongs_to(:user, User, type: Pleroma.FlakeId)
|
belongs_to(:user, User, type: Pleroma.FlakeId)
|
||||||
belongs_to(:conversation, Conversation)
|
belongs_to(:conversation, Conversation)
|
||||||
field(:read, :boolean, default: false)
|
field(:read, :boolean, default: false)
|
||||||
|
field(:last_activity_id, Pleroma.FlakeId, virtual: true)
|
||||||
|
|
||||||
timestamps()
|
timestamps()
|
||||||
end
|
end
|
||||||
@ -59,4 +61,29 @@ defmodule Pleroma.Conversation.Participation do
|
|||||||
)
|
)
|
||||||
|> Pleroma.Pagination.fetch_paginated(params)
|
|> Pleroma.Pagination.fetch_paginated(params)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def for_user_with_last_activity_id(user, params \\ %{}) do
|
||||||
|
for_user(user, params)
|
||||||
|
|> Repo.preload(:conversation)
|
||||||
|
|> Enum.map(fn participation ->
|
||||||
|
# TODO: Don't load all those activities, just get the most recent
|
||||||
|
# Involves splitting up the query.
|
||||||
|
activities =
|
||||||
|
ActivityPub.fetch_activities_for_context(participation.conversation.ap_id, %{
|
||||||
|
"user" => user,
|
||||||
|
"blocking_user" => user
|
||||||
|
})
|
||||||
|
|
||||||
|
activity_id =
|
||||||
|
case activities do
|
||||||
|
[activity | _] -> activity.id
|
||||||
|
_ -> nil
|
||||||
|
end
|
||||||
|
|
||||||
|
%{
|
||||||
|
participation
|
||||||
|
| last_activity_id: activity_id
|
||||||
|
}
|
||||||
|
end)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
@ -80,5 +80,12 @@ defmodule Pleroma.Conversation.ParticipationTest do
|
|||||||
|> Repo.preload(:conversation)
|
|> Repo.preload(:conversation)
|
||||||
|
|
||||||
assert participation_one.conversation.ap_id == activity_three.data["object"]["context"]
|
assert participation_one.conversation.ap_id == activity_three.data["object"]["context"]
|
||||||
|
|
||||||
|
# With last_activity_id
|
||||||
|
assert [participation_one] =
|
||||||
|
Participation.for_user_with_last_activity_id(user, %{limit: 1})
|
||||||
|
|> Repo.preload(:conversation)
|
||||||
|
|
||||||
|
assert participation_one.last_activity_id == activity_three.id
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user