tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Search account domain in lowercase (#13016)

Browse Source 
* Search account domain in lowercase

* fix rubocop error

* fix spec/models/account_spec.rb
This commit is contained in:
abcang
2020-02-01 23:42:24 +09:00
committed by GitHub
parent 37dc12dd53
commit 61a7390b66
5 changed files with 55 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/concerns/account_finder_concern.rb
View File

@ -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