mirror of
https://github.com/discourse/discourse.git
synced 2025-05-31 06:58:31 +08:00
update bbcode dialect and fix vBulletin importer
This commit is contained in:
@ -6,8 +6,6 @@ module UserNameSuggester
|
||||
find_available_username_based_on(name)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def self.parse_name_from_email(name)
|
||||
if name =~ User::EMAIL
|
||||
# When 'walter@white.com' take 'walter'
|
||||
@ -19,7 +17,7 @@ module UserNameSuggester
|
||||
end
|
||||
|
||||
def self.find_available_username_based_on(name)
|
||||
name = rightsize_username(sanitize_username!(name))
|
||||
name = fix_username(name)
|
||||
i = 1
|
||||
attempt = name
|
||||
until User.username_available?(attempt)
|
||||
@ -31,11 +29,15 @@ module UserNameSuggester
|
||||
attempt
|
||||
end
|
||||
|
||||
def self.sanitize_username!(name)
|
||||
def self.fix_username(name)
|
||||
rightsize_username(sanitize_username(name))
|
||||
end
|
||||
|
||||
def self.sanitize_username(name)
|
||||
name = ActiveSupport::Inflector.transliterate(name)
|
||||
name.gsub!(/^[^[:alnum:]]+|\W+$/, "")
|
||||
name.gsub!(/\W+/, "_")
|
||||
name.gsub!(/^\_+/, '')
|
||||
name = name.gsub(/^[^[:alnum:]]+|\W+$/, "")
|
||||
.gsub(/\W+/, "_")
|
||||
.gsub(/^\_+/, '')
|
||||
name
|
||||
end
|
||||
|
||||
|
Reference in New Issue
Block a user