aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/activity_expiration.ex
diff options
context:
space:
mode:
Diffstat (limited to 'lib/pleroma/activity_expiration.ex')
-rw-r--r--lib/pleroma/activity_expiration.ex5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/pleroma/activity_expiration.ex b/lib/pleroma/activity_expiration.ex
index 7cc9668b3..955f0578e 100644
--- a/lib/pleroma/activity_expiration.ex
+++ b/lib/pleroma/activity_expiration.ex
@@ -46,7 +46,12 @@ defmodule Pleroma.ActivityExpiration do
ActivityExpiration
|> where([exp], exp.scheduled_at < ^naive_datetime)
+ |> limit(50)
+ |> preload(:activity)
|> Repo.all()
+ |> Enum.reject(fn %{activity: activity} ->
+ Activity.pinned_by_actor?(activity)
+ end)
end
def validate_scheduled_at(changeset, false), do: changeset