diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-23 18:13:12 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-02-23 18:13:12 +0100 |
| commit | 3d25fe042679e7f5b9095983feb22f46e24c3033 (patch) | |
| tree | 18b57e7abf4f3edf55f057efd6eb47da698bf0f6 /lib | |
| parent | 2c8615fbf8f8085eb836733b27b33c9522c29c71 (diff) | |
| parent | 0db101ede2eb9f8869932135785b0d83cd05560e (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/workflows/build-image.yml`: Upstream changed the workflow a bit. Conflict comes from us pushing to ghcr while upstream pushes to dockerhub. Ported the upstream changes while still pushing to ghcr.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mastodon/statuses_cli.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mastodon/statuses_cli.rb b/lib/mastodon/statuses_cli.rb index e273e2614..91b08813b 100644 --- a/lib/mastodon/statuses_cli.rb +++ b/lib/mastodon/statuses_cli.rb @@ -54,7 +54,7 @@ module Mastodon ActiveRecord::Base.connection.add_index(:media_attachments, :remote_url, name: :index_media_attachments_remote_url, where: 'remote_url is not null', algorithm: :concurrently, if_not_exists: true) - max_id = Mastodon::Snowflake.id_at(options[:days].days.ago) + max_id = Mastodon::Snowflake.id_at(options[:days].days.ago, with_random: false) start_at = Time.now.to_f unless options[:continue] && ActiveRecord::Base.connection.table_exists?('statuses_to_be_deleted') |