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

ignore forbidden tags on missed search counter

Browse Source
This commit is contained in:
r888888888
2016-02-03 16:53:30 -08:00
parent 25bc2965b3
commit 16e437b048
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/posts_helper.rb
View File

@@ -2,7 +2,7 @@ module PostsHelper
def missed_post_search_count_js def missed_post_search_count_js
return nil unless Danbooru.config.enable_post_search_counts return nil unless Danbooru.config.enable_post_search_counts
if params[:ms] == "1" && params[:tags].to_s.scan(/\S+/).size == 1 if params[:ms] == "1" && @post_set.post_count == 0 && @post_set.is_single_tag?
session_id = session.id session_id = session.id
digest = OpenSSL::Digest.new("sha256") digest = OpenSSL::Digest.new("sha256")
sig = OpenSSL::HMAC.hexdigest(digest, Danbooru.config.shared_remote_key, ",#{session_id}") sig = OpenSSL::HMAC.hexdigest(digest, Danbooru.config.shared_remote_key, ",#{session_id}")

12
app/views/posts/partials/index/_missed_search_count.html.erb
View File

@@ -1,12 +1,10 @@
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
var tags = $("#tags").val(); var tags = $("#tags").val();
if ($(".post-preview").size() === 0) { $.post("<%= Danbooru.config.report_server %>/missed_searches", {
$.post("<%= Danbooru.config.report_server %>/missed_searches", { session_id: "<%= session_id %>",
session_id: "<%= session_id %>", tags: tags,
tags: tags, sig: "<%= sig %>"
sig: "<%= sig %>" });
});
}
}); });
</script> </script>

2
config/danbooru_default_config.rb
View File

@@ -233,7 +233,7 @@ module Danbooru
end end
def can_user_see_post?(user, post) def can_user_see_post?(user, post)
if is_user_restricted?(user) && is_post_restricted?(post) if is_user_restricted?(user) && is_post_restricted?(post)
false false
else else
true true