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

…3803)
fedibird · Apr 22, 2023 · 430cadc · 430cadc
1 parent 465c1b3
commit 430cadc
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -508,10 +508,13 @@ def sanitize_languages
   def prepare_new_user!
     BootstrapTimelineWorker.perform_async(account_id)
     ActivityTracker.increment('activity:accounts:local')
+    ActivityTracker.record('activity:logins', id)
     UserMailer.welcome(self).deliver_later
   end
 
   def prepare_returning_user!
+    return unless confirmed?
+
     ActivityTracker.record('activity:logins', id)
     regenerate_feed! if needs_feed_update?
   end