hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pin/unpin for activities with expires_at option

Browse source
This commit is contained in:
Alexander Strizhakov 2020-09-04 11:40:32 +03:00 • committed by rinpatch
commit eb5ff715f7
5 changed files with 64 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/pleroma/workers/purge_expired_activity.ex
View file

@ -31,18 +31,8 @@ defmodule Pleroma.Workers.PurgeExpiredActivity do
@impl true
def perform(%Oban.Job{args: %{"activity_id" => id}}) do
with %Activity{} = activity <- find_activity(id),
%Pleroma.User{} = user <- find_user(activity.object.data["actor"]),
false <- pinned_by_actor?(activity, user) do
%Pleroma.User{} = user <- find_user(activity.object.data["actor"]) do
Pleroma.Web.CommonAPI.delete(activity.id, user)
else
:pinned_by_actor ->
# if activity is pinned, schedule deletion on next day
enqueue(%{activity_id: id, expires_at: DateTime.add(DateTime.utc_now(), 24 * 3600)})
:ok
error ->
error
end
end
@ -74,12 +64,6 @@ defmodule Pleroma.Workers.PurgeExpiredActivity do
end
end
defp pinned_by_actor?(activity, user) do
with true <- Activity.pinned_by_actor?(activity, user) do
:pinned_by_actor
end
end
def get_expiration(id) do
from(j in Oban.Job,
where: j.state == "scheduled",