Fix unconfirmed accounts being registered as active users (#23803)

1 files changed, 3 insertions, 0 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index 5e106dee5..d56a9b9ca 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -507,11 +507,14 @@ class User < ApplicationRecord
   def prepare_new_user!
     BootstrapTimelineWorker.perform_async(account_id)
     ActivityTracker.increment('activity:accounts:local')
+    ActivityTracker.record('activity:logins', id)
     UserMailer.welcome(self).deliver_later
     TriggerWebhookWorker.perform_async('account.approved', 'Account', account_id)
   end
 
   def prepare_returning_user!
+    return unless confirmed?
+
     ActivityTracker.record('activity:logins', id)
     regenerate_feed! if needs_feed_update?
   end