about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--app/helpers/moderation_helper.rb6
-rw-r--r--app/workers/scheduler/janitor_scheduler.rb9
2 files changed, 7 insertions, 8 deletions
diff --git a/app/helpers/moderation_helper.rb b/app/helpers/moderation_helper.rb
index b6fd7be53..730af2603 100644
--- a/app/helpers/moderation_helper.rb
+++ b/app/helpers/moderation_helper.rb
@@ -4,6 +4,12 @@ module ModerationHelper
   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)
 
+  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)
     return if policy.blank?
     policy = policy.to_s
diff --git a/app/workers/scheduler/janitor_scheduler.rb b/app/workers/scheduler/janitor_scheduler.rb
index c01cb8b4e..05d62605e 100644
--- a/app/workers/scheduler/janitor_scheduler.rb
+++ b/app/workers/scheduler/janitor_scheduler.rb
@@ -10,7 +10,7 @@ class Scheduler::JanitorScheduler
   sidekiq_options unique: :until_executed, retry: 0
 
   def perform
-    @account = admin_account
+    @account = janitor_account
     return if @account.nil?
 
     @exclude_ids = excluded_account_ids
@@ -63,13 +63,6 @@ class Scheduler::JanitorScheduler
   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
     spammer_ids = spammer_account_ids
     Account.reorder(nil).where(id: spammer_ids, suspended_at: nil)