From 61a7390b666dc40beda291da426436a9d36f4288 Mon Sep 17 00:00:00 2001 From: abcang Date: Sat, 1 Feb 2020 23:42:24 +0900 Subject: Search account domain in lowercase (#13016) * Search account domain in lowercase * fix rubocop error * fix spec/models/account_spec.rb --- app/models/account.rb | 3 +-- app/models/concerns/account_finder_concern.rb | 8 ++------ 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'app/models') diff --git a/app/models/account.rb b/app/models/account.rb index da6f51a9c..0eb719d65 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -70,14 +70,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: 30 }, if: -> { local? && will_save_change_to_display_name? } validates :note, note_length: { maximum: 500 }, if: -> { local? && will_save_change_to_note? } diff --git a/app/models/concerns/account_finder_concern.rb b/app/models/concerns/account_finder_concern.rb index a54c2174d..04b2c981b 100644 --- a/app/models/concerns/account_finder_concern.rb +++ b/app/models/concerns/account_finder_concern.rb @@ -48,7 +48,7 @@ module AccountFinderConcern end def with_usernames - Account.where.not(username: '') + Account.where.not(Account.arel_table[:username].lower.eq '') end def matching_username @@ -56,11 +56,7 @@ module AccountFinderConcern end def matching_domain - if domain.nil? - Account.where(domain: nil) - else - Account.where(Account.arel_table[:domain].lower.eq domain.to_s.downcase) - end + Account.where(Account.arel_table[:domain].lower.eq(domain.nil? ? nil : domain.to_s.downcase)) end end end -- cgit