Merge branch 'develop' into stable

This commit is contained in:
FloatingGhost 2024-03-30 13:00:13 +00:00
commit d71d52302c

View file

@ -237,7 +237,7 @@ defp search_local_notes_without_create_id() do
|> where([o, a], fragment("NOT (? \\? 'id') OR ?->>'id' IS NULL", a.data, a.data))
|> select([o, a], {a.id, fragment("?->>'id'", o.data)})
|> order_by([o, a], a.id)
|> Pleroma.Repo.all()
|> Pleroma.Repo.all(timeout: :infinity)
end
defp search_sus_notes_by_id_patterns() do
@ -272,7 +272,7 @@ defp search_sus_notes_by_id_patterns() do
)
|> select([o, a], {a.id, fragment("?->>'id'", o.data)})
|> order_by([o, a], a.id)
|> Pleroma.Repo.all()
|> Pleroma.Repo.all(timeout: :infinity)
end
defp search_bogus_local_users() do
@ -280,7 +280,7 @@ defp search_bogus_local_users() do
|> where([u], u.local == false and like(u.ap_id, ^local_id_pattern()))
|> order_by([u], u.ap_id)
|> select([u], u.ap_id)
|> Pleroma.Repo.all()
|> Pleroma.Repo.all(timeout: :infinity)
end
# +-----------------------------------+