From 63f675b7d61c044130a7de917084ab00922f7f31 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Tue, 2 Jun 2020 14:41:06 -0500
Subject: [PATCH] config: remove `enable_post_search_counts` option.

Enable by default if reportbooru is configured, otherwise disable.
---
 app/helpers/posts_helper.rb       | 10 +++++++---
 app/views/posts/index.html.erb    |  2 +-
 config/danbooru_default_config.rb |  6 ------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/helpers/posts_helper.rb b/app/helpers/posts_helper.rb
index c932758df..dc5b4d0c3 100644
--- a/app/helpers/posts_helper.rb
+++ b/app/helpers/posts_helper.rb
@@ -5,8 +5,8 @@ module PostsHelper
     end.join("").html_safe
   end
 
-  def post_search_counts_enabled?
-    Danbooru.config.enable_post_search_counts && Danbooru.config.reportbooru_server.present? && Danbooru.config.reportbooru_key.present?
+  def reportbooru_enabled?
+    Danbooru.config.reportbooru_server.present? && Danbooru.config.reportbooru_key.present?
   end
 
   def discover_mode?
@@ -14,17 +14,21 @@ module PostsHelper
   end
 
   def missed_post_search_count_js(tags)
+    return unless reportbooru_enabled?
+
     sig = generate_reportbooru_signature(tags)
     render "posts/partials/index/missed_search_count", sig: sig
   end
 
   def post_search_count_js(tags)
+    return unless reportbooru_enabled?
+
     sig = generate_reportbooru_signature("ps-#{tags}")
     render "posts/partials/index/search_count", sig: sig
   end
 
   def post_view_count_js
-    return unless post_search_counts_enabled?
+    return unless reportbooru_enabled?
 
     msg = generate_reportbooru_signature(params[:id])
     render "posts/partials/show/view_count", msg: msg
diff --git a/app/views/posts/index.html.erb b/app/views/posts/index.html.erb
index 63916f681..093dc49cc 100644
--- a/app/views/posts/index.html.erb
+++ b/app/views/posts/index.html.erb
@@ -49,7 +49,7 @@
   <%= render "posts/partials/common/secondary_links" %>
 <% end %>
 
-<% if post_search_counts_enabled? && @post_set.query.is_simple_tag? && @post_set.current_page == 1 %>
+<% if @post_set.query.is_simple_tag? && @post_set.current_page == 1 %>
   <% if @post_set.post_count == 0 %>
     <%= missed_post_search_count_js(@post_set.query.to_s) %>
   <% else %>
diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb
index 57eda5cee..dcbbdb1a6 100644
--- a/config/danbooru_default_config.rb
+++ b/config/danbooru_default_config.rb
@@ -440,12 +440,6 @@ module Danbooru
       false
     end
 
-    # Enables recording of popular searches, missed searches, and post view
-    # counts. Requires Reportbooru to be configured and running - see below.
-    def enable_post_search_counts
-      false
-    end
-
     # reportbooru options - see https://github.com/r888888888/reportbooru
     def reportbooru_server
     end