Fix unconfirmed accounts being registered as active users (mastodon#2…

…3803)
11ways · Jul 7, 2023 · 81958cb · 81958cb
1 parent a1fd161
commit 81958cb
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -507,11 +507,14 @@ def sanitize_role
   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