X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Factivity_expiration.ex;h=955f0578ee65ed896907dfb1df35fd58c99437f3;hb=34d7e864db8f9cc7fb73ce2fef8466ce8e09ed85;hp=7cc9668b373cc252cf0f42d812cc459e4c321324;hpb=d0fc48ea67d90bf01bd546088b114362592d5eb0;p=akkoma

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