autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added support for configurable reserved usernames (fix of #1382) (#3566)

Browse Source 
* Added support for configurable reserved usernames

* Added reserved usernames from mastodon issue 1355

* Fix reserved usernames
This commit is contained in:
Eugen Rochko
2017-06-05 01:03:45 +02:00
committed by GitHub
parent 3f815b2052
commit f7a30e2fae
5 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/account.rb
View File

@ -56,7 +56,7 @@ class Account < ApplicationRecord
# Local user validations
with_options if: :local? do
validates :username, format: { with: /\A[a-z0-9_]+\z/i }, uniqueness: { scope: :domain, case_sensitive: false }, length: { maximum: 30 }
validates :username, format: { with: /\A[a-z0-9_]+\z/i }, uniqueness: { scope: :domain, case_sensitive: false }, length: { maximum: 30 }, unreserved: true
validates :display_name, length: { maximum: 30 }
validates :note, length: { maximum: 160 }
end

15
app/validators/unreserved_validator.rb Normal file
View File

@ -0,0 +1,15 @@
# frozen_string_literal: true
class UnreservedValidator < ActiveModel::EachValidator
def validate_each(record, attribute, value)
return if value.nil?
record.errors.add(attribute, I18n.t('accounts.reserved_username')) if reserved_username?(value)
end
private
def reserved_username?(value)
return false unless Setting.reserved_usernames
Setting.reserved_usernames.include?(value.downcase)
end
end