techhub/mastodon
2
0
Fork 0
Code Activity

Consolidate account scopes for LOWER (index using) username/domain queries (#30451)

Browse Source
This commit is contained in:
Matt Jankowski
2024-05-28 10:11:31 -04:00
committed by GitHub
parent 32c30bf0fd
commit 4a77e477ee
6 changed files with 14 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
app/models/concerns/account/finder_concern.rb
View File

@@ -25,42 +25,11 @@ module Account::FinderConcern
end
def find_remote(username, domain)
AccountFinder.new(username, domain).account
end
end
class AccountFinder
attr_reader :username, :domain
def initialize(username, domain)
@username = username
@domain = domain
end
def account
scoped_accounts.order(id: :asc).take
end
private
def scoped_accounts
Account.unscoped.tap do |scope|
scope.merge! with_usernames
scope.merge! matching_username
scope.merge! matching_domain
end
end
def with_usernames
Account.where.not(Account.arel_table[:username].lower.eq '')
end
def matching_username
Account.where(Account.arel_table[:username].lower.eq username.to_s.downcase)
end
def matching_domain
Account.where(Account.arel_table[:domain].lower.eq(domain.nil? ? nil : domain.to_s.downcase))
Account
.with_username(username)
.with_domain(domain)
.order(id: :asc)
.take
end
end
end

2
app/models/concerns/user/ldap_authenticable.rb
View File

@@ -22,7 +22,7 @@ module User::LdapAuthenticable
safe_username = safe_username.gsub(keys, replacement)
end
resource = joins(:account).merge(Account.where(Account.arel_table[:username].lower.eq safe_username.downcase)).take
resource = joins(:account).merge(Account.with_username(safe_username)).take
if resource.blank?
resource = new(