From 675c24a34ed8e8600aa750ae957aba9e5d4fc19e Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 6 Mar 2023 16:00:08 +0100
Subject: [PATCH] Fix unconfirmed accounts being registered as active users
 (#23803)

---
 app/models/user.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/models/user.rb b/app/models/user.rb
index c767f89842..efbe29f444 100644
--- 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