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

3 years ago · 675c24a34e
1 changed files with 3 additions and 0 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -504,11 +504,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