Merge branch 'develop' into stable
Some checks are pending
ci/woodpecker/push/lint Pipeline was successful
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/push/build-arm64 Pipeline was successful
ci/woodpecker/push/build-amd64 Pipeline was successful
ci/woodpecker/push/docs Pipeline was successful
ci/woodpecker/tag/build-amd64 Pipeline is pending
ci/woodpecker/tag/build-arm64 Pipeline is pending
ci/woodpecker/tag/docs Pipeline is pending
ci/woodpecker/tag/lint Pipeline is pending
ci/woodpecker/tag/test Pipeline is pending

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