diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-03-21 13:39:31 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-03-21 13:39:31 -0500 |
| commit | 9c3e4bdead953fb67fde32f5ef5db39ed2974362 (patch) | |
| tree | 5123d546ae516640c57c1d4f1047663e8c733343 /app/models | |
| parent | e8aeec4fead8810ee2efcdb2b0198941dfb168ee (diff) | |
| parent | 6290cd796937e8bfb43ab360a578ac42f53afda9 (diff) | |
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/account.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 61f81ab70..16a256bfc 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -47,7 +47,8 @@ # class Account < ApplicationRecord - MENTION_RE = /(?<=^|[^\/[:word:]])@(([a-z0-9_]+)(?:@[a-z0-9\.\-]+[a-z0-9]+)?)/i + USERNAME_RE = /[a-z0-9_]+([a-z0-9_\.]+[a-z0-9_]+)?/i + MENTION_RE = /(?<=^|[^\/[:word:]])@((#{USERNAME_RE}?)(?:@[a-z0-9\.\-]+[a-z0-9]+)?)/i include AccountAvatar include AccountFinderConcern @@ -70,7 +71,8 @@ class Account < ApplicationRecord validates :username, uniqueness: { scope: :domain, case_sensitive: true }, if: -> { !local? && will_save_change_to_username? } # Local user validations - validates :username, format: { with: /\A[a-z0-9_]+\z/i }, uniqueness: { scope: :domain, case_sensitive: false }, length: { maximum: 30 }, if: -> { local? && will_save_change_to_username? } + validates :username, format: { with: /\A#{USERNAME_RE}\z/i }, length: { maximum: 30 }, if: -> { local? && will_save_change_to_username? } + 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: 30 }, if: -> { local? && will_save_change_to_display_name? } validate :note_length_does_not_exceed_length_limit, if: -> { local? && will_save_change_to_note? } |