projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'secfix/search-crash' into 'develop'
[akkoma]
/
lib
/
pleroma
/
activity_expiration.ex
diff --git
a/lib/pleroma/activity_expiration.ex
b/lib/pleroma/activity_expiration.ex
index 7cc9668b373cc252cf0f42d812cc459e4c321324..955f0578ee65ed896907dfb1df35fd58c99437f3 100644
(file)
--- 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)
ActivityExpiration
|> where([exp], exp.scheduled_at < ^naive_datetime)
+ |> limit(50)
+ |> preload(:activity)
|> Repo.all()
|> Repo.all()
+ |> Enum.reject(fn %{activity: activity} ->
+ Activity.pinned_by_actor?(activity)
+ end)
end
def validate_scheduled_at(changeset, false), do: changeset
end
def validate_scheduled_at(changeset, false), do: changeset