From 8917cc303506daf92b7d51ef8431a873052df33d Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Fri, 7 Aug 2020 09:10:00 -0500
Subject: [PATCH] maintenance: prune posts hourly instead of daily.

---
 app/logical/danbooru_maintenance.rb    | 2 +-
 test/unit/danbooru_maintenance_test.rb | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/logical/danbooru_maintenance.rb b/app/logical/danbooru_maintenance.rb
index b87e05e10..76823c567 100644
--- a/app/logical/danbooru_maintenance.rb
+++ b/app/logical/danbooru_maintenance.rb
@@ -3,10 +3,10 @@ module DanbooruMaintenance
 
   def hourly
     safely { Upload.prune! }
+    safely { PostPruner.prune! }
   end
 
   def daily
-    safely { PostPruner.prune! }
     safely { Delayed::Job.where('created_at < ?', 45.days.ago).delete_all }
     safely { PostDisapproval.prune! }
     safely { regenerate_post_counts! }
diff --git a/test/unit/danbooru_maintenance_test.rb b/test/unit/danbooru_maintenance_test.rb
index e95a08327..c6f73b924 100644
--- a/test/unit/danbooru_maintenance_test.rb
+++ b/test/unit/danbooru_maintenance_test.rb
@@ -1,9 +1,9 @@
 require 'test_helper'
 
 class DanbooruMaintenanceTest < ActiveSupport::TestCase
-  context "daily maintenance" do
+  context "hourly maintenance" do
     should "work" do
-      assert_nothing_raised { DanbooruMaintenance.daily }
+      assert_nothing_raised { DanbooruMaintenance.hourly }
     end
 
     should "prune expired posts" do
@@ -14,7 +14,7 @@ class DanbooruMaintenanceTest < ActiveSupport::TestCase
       @flag = create(:post_flag, post: @flagged, created_at: 4.days.ago)
       @appeal = create(:post_appeal, post: @appealed, created_at: 4.days.ago)
 
-      DanbooruMaintenance.daily
+      DanbooruMaintenance.hourly
 
       assert_equal(true, @pending.reload.is_deleted?)
       assert_equal(true, @flagged.reload.is_deleted?)
@@ -22,7 +22,9 @@ class DanbooruMaintenanceTest < ActiveSupport::TestCase
       assert_equal(true, @flag.reload.succeeded?)
       assert_equal(true, @appeal.reload.rejected?)
     end
+  end
 
+  context "hourly maintenance" do
     context "when pruning bans" do
       should "clear the is_banned flag for users who are no longer banned" do
         banner = FactoryBot.create(:admin_user)