diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-02-03 09:22:58 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-02-03 09:22:58 +0100 |
| commit | 369201a425f7b539290815402a4bc65923911e11 (patch) | |
| tree | 45de36cd6aa8c22aaf4be6cefaeeb70218d4daf5 /app/models/account.rb | |
| parent | 4cd2d13bd226c005317adf9848f4c0316401b2ff (diff) | |
| parent | 3adc722d1cdd28d87d2724b8952d7ec52d241b52 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/models/account.rb')
| -rw-r--r-- | app/models/account.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index b856d1c76..e46888415 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -74,14 +74,13 @@ class Account < ApplicationRecord enum protocol: [:ostatus, :activitypub] validates :username, presence: true + validates_with UniqueUsernameValidator, if: -> { will_save_change_to_username? } # Remote user validations - validates :username, uniqueness: { scope: :domain, case_sensitive: true }, if: -> { !local? && will_save_change_to_username? } validates :username, format: { with: /\A#{USERNAME_RE}\z/i }, if: -> { !local? && will_save_change_to_username? } # Local user validations validates :username, format: { with: /\A[a-z0-9_]+\z/i }, length: { maximum: 30 }, if: -> { local? && will_save_change_to_username? && actor_type != 'Application' } - validates_with UniqueUsernameValidator, if: -> { local? && will_save_change_to_username? } validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? } validates :display_name, length: { maximum: MAX_DISPLAY_NAME_LENGTH }, if: -> { local? && will_save_change_to_display_name? } validates :note, note_length: { maximum: MAX_NOTE_LENGTH }, if: -> { local? && will_save_change_to_note? } |