From bd16e3f63e1b0a288982e4e6423e2cdb4ae0dc82 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 23 Mar 2026 04:14:38 -0400
Subject: [PATCH] Use progress total tracker in accounts CLI (#38296)

---
 lib/mastodon/cli/accounts.rb | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/mastodon/cli/accounts.rb b/lib/mastodon/cli/accounts.rb
index 25e966bd8e..e4c1aac128 100644
--- a/lib/mastodon/cli/accounts.rb
+++ b/lib/mastodon/cli/accounts.rb
@@ -17,7 +17,6 @@ module Mastodon::CLI
     LONG_DESC
     def rotate(username = nil)
       if options[:all]
-        processed = 0
         delay     = 0
         scope     = Account.local.without_suspended
         progress  = create_progress_bar(scope.count)
@@ -26,14 +25,13 @@ module Mastodon::CLI
           accounts.each do |account|
             rotate_keys_for_account(account, delay)
             progress.increment
-            processed += 1
           end
 
           delay += 5.minutes
         end
 
         progress.finish
-        say("OK, rotated keys for #{processed} accounts", :green)
+        say("OK, rotated keys for #{progress.progress} accounts", :green)
       elsif username.present?
         rotate_keys_for_account(Account.find_local(username))
         say('OK', :green)
@@ -442,7 +440,6 @@ module Mastodon::CLI
       total    += account.following.reorder(nil).count if options[:follows]
       total    += account.followers.reorder(nil).count if options[:followers]
       progress  = create_progress_bar(total)
-      processed = 0
 
       if options[:follows]
         account.following.reorder(nil).find_each do |target_account|
@@ -451,7 +448,6 @@ module Mastodon::CLI
           progress.log pastel.red("Error processing #{target_account.id}: #{e}")
         ensure
           progress.increment
-          processed += 1
         end
 
         BootstrapTimelineWorker.perform_async(account.id)
@@ -464,12 +460,11 @@ module Mastodon::CLI
           progress.log pastel.red("Error processing #{target_account.id}: #{e}")
         ensure
           progress.increment
-          processed += 1
         end
       end
 
       progress.finish
-      say("Processed #{processed} relationships", :green, true)
+      say("Processed #{progress.progress} relationships", :green, true)
     end
 
     option :number, type: :numeric, aliases: [:n]