From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 23 Mar 2019 01:23:48 +0000 (+0100)
Subject: If registrations have been re-opened when user confirms account, approve (#10349)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=00d988955f63551e86dd33ca1a26f73f7d0c7b45;p=mastodon.git

If registrations have been re-opened when user confirms account, approve (#10349)
---

diff --git a/app/models/user.rb b/app/models/user.rb
index 9d0d49676..d703f9588 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -124,7 +124,8 @@ class User < ApplicationRecord
   end
 
   def confirm
-    new_user = !confirmed?
+    new_user      = !confirmed?
+    self.approved = true if open_registrations?
 
     super
 
@@ -136,7 +137,8 @@ class User < ApplicationRecord
   end
 
   def confirm!
-    new_user = !confirmed?
+    new_user      = !confirmed?
+    self.approved = true if open_registrations?
 
     skip_confirmation!
     save!
@@ -264,7 +266,11 @@ class User < ApplicationRecord
   private
 
   def set_approved
-    self.approved = Setting.registrations_mode == 'open' || invited?
+    self.approved = open_registrations? || invited?
+  end
+
+  def open_registrations?
+    Setting.registrations_mode == 'open'
   end
 
   def sanitize_languages