jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix calling reportbooru when it isn't fully configured (#3834).

Browse Source
This commit is contained in:
evazion
2018-08-24 11:23:19 -05:00
parent cf5c458020
commit 8833374294
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/helpers/posts_helper.rb
View File

@@ -1,4 +1,8 @@
module PostsHelper module PostsHelper
def post_search_counts_enabled?
Danbooru.config.enable_post_search_counts && Danbooru.config.reportbooru_server.present? && Danbooru.config.reportbooru_key.present?
end
def discover_mode? def discover_mode?
params[:tags] =~ /order:rank/ || params[:action] =~ /searches|viewed/ params[:tags] =~ /order:rank/ || params[:action] =~ /searches|viewed/
end end
@@ -18,7 +22,7 @@ module PostsHelper
end end
def missed_post_search_count_js def missed_post_search_count_js
return nil unless Danbooru.config.enable_post_search_counts return nil unless post_search_counts_enabled?
if params[:ms] == "1" && @post_set.post_count == 0 && @post_set.is_single_tag? if params[:ms] == "1" && @post_set.post_count == 0 && @post_set.is_single_tag?
session_id = session.id session_id = session.id
@@ -29,7 +33,7 @@ module PostsHelper
end end
def post_search_count_js def post_search_count_js
return nil unless Danbooru.config.enable_post_search_counts return nil unless post_search_counts_enabled?
if action_name == "index" && params[:page].nil? if action_name == "index" && params[:page].nil?
tags = Tag.scan_query(params[:tags]).sort.join(" ") tags = Tag.scan_query(params[:tags]).sort.join(" ")
@@ -47,7 +51,7 @@ module PostsHelper
end end
def post_view_count_js def post_view_count_js
return nil unless Danbooru.config.enable_post_search_counts return nil unless post_search_counts_enabled?
msg = "#{params[:id]},#{session.id}" msg = "#{params[:id]},#{session.id}"
msg = ActiveSupport::MessageVerifier.new(Danbooru.config.reportbooru_key, serializer: JSON, digest: "SHA256").generate(msg) msg = ActiveSupport::MessageVerifier.new(Danbooru.config.reportbooru_key, serializer: JSON, digest: "SHA256").generate(msg)
@@ -55,7 +59,7 @@ module PostsHelper
end end
def common_searches_html(user) def common_searches_html(user)
return nil unless Danbooru.config.enable_post_search_counts return nil unless post_search_counts_enabled?
return nil unless user.is_platinum? return nil unless user.is_platinum?
return nil unless user.enable_recent_searches? return nil unless user.enable_recent_searches?