move `Scheduler::JanitorScheduler::admin_account` to `ModerationHelper::janitor_account`
parent
0a646efd48
commit
4801d5ac84
|
@ -4,6 +4,12 @@ module ModerationHelper
|
||||||
POLICIES = %w(silence unsilence suspend unsuspend force_unlisted allow_public force_sensitive allow_nonsensitive reset)
|
POLICIES = %w(silence unsilence suspend unsuspend force_unlisted allow_public force_sensitive allow_nonsensitive reset)
|
||||||
EXCLUDED_DOMAINS = %w(tailma.ws monsterpit.net monsterpit.cloud monsterpit.gallery monsterpit.blog)
|
EXCLUDED_DOMAINS = %w(tailma.ws monsterpit.net monsterpit.cloud monsterpit.gallery monsterpit.blog)
|
||||||
|
|
||||||
|
def janitor_account
|
||||||
|
account_id = ENV.fetch('JANITOR_USER', '').to_i
|
||||||
|
return if account_id == 0
|
||||||
|
Account.find_by(id: account_id)
|
||||||
|
end
|
||||||
|
|
||||||
def account_policy(username, domain, policy, reason = nil)
|
def account_policy(username, domain, policy, reason = nil)
|
||||||
return if policy.blank?
|
return if policy.blank?
|
||||||
policy = policy.to_s
|
policy = policy.to_s
|
||||||
|
|
|
@ -10,7 +10,7 @@ class Scheduler::JanitorScheduler
|
||||||
sidekiq_options unique: :until_executed, retry: 0
|
sidekiq_options unique: :until_executed, retry: 0
|
||||||
|
|
||||||
def perform
|
def perform
|
||||||
@account = admin_account
|
@account = janitor_account
|
||||||
return if @account.nil?
|
return if @account.nil?
|
||||||
|
|
||||||
@exclude_ids = excluded_account_ids
|
@exclude_ids = excluded_account_ids
|
||||||
|
@ -63,13 +63,6 @@ class Scheduler::JanitorScheduler
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def admin_account
|
|
||||||
account_id = ENV.fetch('JANITOR_USER', '').to_i
|
|
||||||
return if account_id == 0
|
|
||||||
Account.find_by(id: account_id)
|
|
||||||
end
|
|
||||||
|
|
||||||
def spammer_accounts
|
def spammer_accounts
|
||||||
spammer_ids = spammer_account_ids
|
spammer_ids = spammer_account_ids
|
||||||
Account.reorder(nil).where(id: spammer_ids, suspended_at: nil)
|
Account.reorder(nil).where(id: spammer_ids, suspended_at: nil)
|
||||||
|
|
Loading…
Reference in New Issue