diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-14 05:28:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-14 05:28:30 +0100 |
| commit | 51e154f5e87968d6bb115e053689767ab33e80cd (patch) | |
| tree | d86ba475bfc61ba7a774bf36e24704dc82f68991 /app/models/account_filter.rb | |
| parent | 6e3936aa6f4296ac202b54c0b178b4fa825d7885 (diff) | |
Admission-based registrations mode (#10250)
Fix #6856 Fix #6951
Diffstat (limited to 'app/models/account_filter.rb')
| -rw-r--r-- | app/models/account_filter.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/account_filter.rb b/app/models/account_filter.rb index b10f50db7..d2503100c 100644 --- a/app/models/account_filter.rb +++ b/app/models/account_filter.rb @@ -22,7 +22,7 @@ class AccountFilter def set_defaults! params['local'] = '1' if params['remote'].blank? - params['active'] = '1' if params['suspended'].blank? && params['silenced'].blank? + params['active'] = '1' if params['suspended'].blank? && params['silenced'].blank? && params['pending'].blank? end def scope_for(key, value) @@ -35,6 +35,8 @@ class AccountFilter Account.where(domain: value) when 'active' Account.without_suspended + when 'pending' + accounts_with_users.merge User.pending when 'silenced' Account.silenced when 'suspended' |