Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 08:48:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2024-01-15 20:27:41 +01:00
parent 8cad0a4d6b a2f02a0775
commit 2f521bc84a
275 changed files with 867 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/user.rb
View File

@@ -187,7 +187,7 @@ class User < ApplicationRecord
def confirm
new_user = !confirmed?
self.approved = true if open_registrations? && !sign_up_from_ip_requires_approval?
self.approved = true if grant_approval_on_confirmation?
super
@@ -206,7 +206,7 @@ class User < ApplicationRecord
def confirm!
new_user = !confirmed?
self.approved = true if open_registrations?
self.approved = true if grant_approval_on_confirmation?
skip_confirmation!
save!
@@ -426,6 +426,11 @@ class User < ApplicationRecord
end
end
def grant_approval_on_confirmation?
# Re-check approval on confirmation if the server has switched to open registrations
open_registrations? && !sign_up_from_ip_requires_approval? && !sign_up_email_requires_approval?
end
def sign_up_from_ip_requires_approval?
!sign_up_ip.nil? && IpBlock.where(severity: :sign_up_requires_approval).where('ip >>= ?', sign_up_ip.to_s).exists?
end