From 4801d5ac847f67681a633d041cfa639780c4f12b Mon Sep 17 00:00:00 2001
From: multiple creatures <dev@multiple-creature.party>
Date: Sat, 3 Aug 2019 23:25:37 -0500
Subject: move `Scheduler::JanitorScheduler::admin_account` to
 `ModerationHelper::janitor_account`

---
 app/workers/scheduler/janitor_scheduler.rb | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'app/workers')

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)
-- 
cgit