Merge remote-tracking branch 'parent/main' into upstream-20240524

2024-05-24 08:33:49 +09:00 · 2024-05-24 08:33:49 +09:00 · c546939a40
commit c546939a40
parent 749816a189 b6fd14f0e2
213 changed files with 2260 additions and 986 deletions
--- a/app/lib/vacuum/statuses_vacuum.rb
+++ b/app/lib/vacuum/statuses_vacuum.rb
@ -34,7 +34,7 @@ class Vacuum::StatusesVacuum
  def statuses_scope
    scope = Status.unscoped.kept
                  .joins(:account).merge(Account.remote)
-                  .where('statuses.id < ?', retention_period_as_id)
+                  .where(statuses: { id: ...retention_period_as_id })

    if Setting.delete_content_cache_without_reaction
      scope = scope.where.not(id: favourited_statuses)