diff options
| author | Emelia Smith <ThisIsMissEm@users.noreply.github.com> | 2018-04-23 21:27:18 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-04-23 21:27:18 +0200 |
| commit | 495303d9b86919c72bf1948a714bf8d00b41fa0f (patch) | |
| tree | b8bc50013a96a73b63b3bd4e79b242cc4a75f3b6 /app | |
| parent | 53b1d8887325160934dec7557e97a43ce2896264 (diff) | |
Prevent suspended accounts from appearing in AccountSearchService (#7246)
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/account.rb | 1 | ||||
| -rw-r--r-- | app/services/account_search_service.rb | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 0a4370be4..ee47f04af 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -117,6 +117,7 @@ class Account < ApplicationRecord scope :partitioned, -> { order(Arel.sql('row_number() over (partition by domain)')) } scope :silenced, -> { where(silenced: true) } scope :suspended, -> { where(suspended: true) } + scope :without_suspended, -> { where(suspended: false) } scope :recent, -> { reorder(id: :desc) } scope :alphabetic, -> { order(domain: :asc, username: :asc) } scope :by_domain_accounts, -> { group(:domain).select(:domain, 'COUNT(*) AS accounts_count').order('accounts_count desc') } diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb index 3860a9cbd..7edbd9b47 100644 --- a/app/services/account_search_service.rb +++ b/app/services/account_search_service.rb @@ -65,9 +65,9 @@ class AccountSearchService < BaseService def exact_match @_exact_match ||= begin if domain_is_local? - search_from.find_local(query_username) + search_from.without_suspended.find_local(query_username) else - search_from.find_remote(query_username, query_domain) + search_from.without_suspended.find_remote(query_username, query_domain) end end end |