bgme/mastodon
1
0
Fork 0
mirror of https://github.com/yingziwu/mastodon.git synced 2026-02-24 19:22:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge tag 'v3.1.0'

Browse source
This commit is contained in:
wuyingren 2020-02-09 11:56:52 +08:00
commit be34e9c88d
188 changed files with 2426 additions and 796 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/validators/unique_username_validator.rb
View file

@ -7,8 +7,9 @@ class UniqueUsernameValidator < ActiveModel::Validator
return if account.username.nil?
normalized_username = account.username.downcase
normalized_domain = account.domain&.downcase
scope = Account.where(domain: nil).where('lower(username) = ?', normalized_username)
scope = Account.where(Account.arel_table[:username].lower.eq normalized_username).where(Account.arel_table[:domain].lower.eq normalized_domain)
scope = scope.where.not(id: account.id) if account.persisted?
account.errors.add(:username, :taken) if scope.exists?