REFACTOR: Add User.reserved_username?.

This commit is contained in:
Guo Xiang Tan
2017-04-13 10:44:26 +08:00
parent f48022b674
commit 57788200ec
3 changed files with 30 additions and 16 deletions

View File

@ -162,9 +162,15 @@ class User < ActiveRecord::Base
def self.username_available?(username)
lower = username.downcase
!User.where(username_lower: lower).exists? && !reserved_username?(lower)
end
User.where(username_lower: lower).blank? &&
SiteSetting.reserved_usernames.split("|").all? { |reserved| !lower.match('^' + Regexp.escape(reserved).gsub('\*', '.*') + '$') }
def self.reserved_username?(username)
lower = username.downcase
SiteSetting.reserved_usernames.split("|").any? do |reserved|
!!lower.match("^#{Regexp.escape(reserved).gsub('\*', '.*')}$")
end
end
def self.plugin_staff_user_custom_fields