Extract User::Confirmation concern (#35582)

app/models/user.rb

@@ -58,6 +58,7 @@ class User < ApplicationRecord
 
   include LanguagesHelper
   include Redisable
+  include User::Confirmation
   include User::HasSettings
   include User::LdapAuthenticable
   include User::Omniauthable
@@ -118,8 +119,6 @@ class User < ApplicationRecord
   scope :recent, -> { order(id: :desc) }
   scope :pending, -> { where(approved: false) }
   scope :approved, -> { where(approved: true) }
-  scope :confirmed, -> { where.not(confirmed_at: nil) }
-  scope :unconfirmed, -> { where(confirmed_at: nil) }
   scope :enabled, -> { where(disabled: false) }
   scope :disabled, -> { where(disabled: true) }
   scope :active, -> { confirmed.signed_in_recently.account_not_suspended }
@@ -184,10 +183,6 @@ class User < ApplicationRecord
     current_sign_in_at.present? && current_sign_in_at >= ACTIVE_DURATION.ago
   end
 
-  def confirmed?
-    confirmed_at.present?
-  end
-
   def invited?
     invite_id.present?
   end
@@ -212,12 +207,6 @@ class User < ApplicationRecord
     account_id
   end
 
-  def confirm
-    wrap_email_confirmation do
-      super
-    end
-  end
-
   # Mark current email as confirmed, bypassing Devise
   def mark_email_as_confirmed!
     wrap_email_confirmation do
@@ -264,10 +253,6 @@ class User < ApplicationRecord
     confirmed? && approved? && !disabled? && !account.unavailable? && !account.memorial?
   end
 
-  def unconfirmed?
-    !confirmed?
-  end
-
   def unconfirmed_or_pending?
     unconfirmed? || pending?
   end