diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-08 15:44:57 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-08 15:44:57 +0100 |
| commit | a8c854b3ea80724797dd18cfe047cdbf7075bda2 (patch) | |
| tree | 480d2cf843d2034a84daa12ea84b29683997b46a /app/models/account_statuses_cleanup_policy.rb | |
| parent | ac219dd1f6d660d3728c5881c4eb3b672fea432e (diff) | |
| parent | 782b6835f786385c41c6455f2a251d1925b19eb5 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/models/account_statuses_cleanup_policy.rb')
| -rw-r--r-- | app/models/account_statuses_cleanup_policy.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/models/account_statuses_cleanup_policy.rb b/app/models/account_statuses_cleanup_policy.rb index 365123653..49adc6ad0 100644 --- a/app/models/account_statuses_cleanup_policy.rb +++ b/app/models/account_statuses_cleanup_policy.rb @@ -139,7 +139,12 @@ class AccountStatusesCleanupPolicy < ApplicationRecord # Filtering on `id` rather than `min_status_age` ago will treat # non-snowflake statuses as older than they really are, but Mastodon # has switched to snowflake IDs significantly over 2 years ago anyway. - max_id = [max_id, Mastodon::Snowflake.id_at(min_status_age.seconds.ago, with_random: false)].compact.min + snowflake_id = Mastodon::Snowflake.id_at(min_status_age.seconds.ago, with_random: false) + + if max_id.nil? || snowflake_id < max_id + max_id = snowflake_id + end + Status.where(Status.arel_table[:id].lteq(max_id)) end |