search: add disapproval:<any|none|disinterest|poor_quality|breaks_rules> metatag.
This commit is contained in:
@@ -128,6 +128,7 @@ Autocomplete.initialize_tag_autocomplete = function() {
|
||||
case "child":
|
||||
case "parent":
|
||||
case "filetype":
|
||||
case "disapproval":
|
||||
Autocomplete.static_metatag_source(term, resp, metatag);
|
||||
return;
|
||||
case "user":
|
||||
@@ -415,6 +416,9 @@ Autocomplete.static_metatags = {
|
||||
filetype: [
|
||||
"jpg", "png", "gif", "swf", "zip", "webm", "mp4"
|
||||
],
|
||||
disapproval: [
|
||||
"any", "none", "disinterest", "poor_quality", "breaks_rules"
|
||||
]
|
||||
}
|
||||
|
||||
Autocomplete.static_metatag_source = function(term, resp, metatag) {
|
||||
|
||||
@@ -229,8 +229,12 @@ class AnonymousUser
|
||||
false
|
||||
end
|
||||
|
||||
def post_disapprovals
|
||||
PostDisapproval.none
|
||||
end
|
||||
|
||||
def saved_searches
|
||||
SavedSearch.where(false)
|
||||
SavedSearch.none
|
||||
end
|
||||
|
||||
def has_saved_searches?
|
||||
|
||||
@@ -222,6 +222,34 @@ class PostQueryBuilder
|
||||
end
|
||||
end
|
||||
|
||||
if q[:disapproval]
|
||||
q[:disapproval].each do |disapproval|
|
||||
disapprovals = CurrentUser.user.post_disapprovals.select(:post_id)
|
||||
|
||||
if disapproval.in?(%w[none false])
|
||||
relation = relation.where.not("posts.id": disapprovals)
|
||||
elsif disapproval.in?(%w[any all true])
|
||||
relation = relation.where("posts.id": disapprovals)
|
||||
else
|
||||
relation = relation.where("posts.id": disapprovals.where(reason: disapproval))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if q[:disapproval_neg]
|
||||
q[:disapproval_neg].each do |disapproval|
|
||||
disapprovals = CurrentUser.user.post_disapprovals.select(:post_id)
|
||||
|
||||
if disapproval.in?(%w[none false])
|
||||
relation = relation.where("posts.id": disapprovals)
|
||||
elsif disapproval.in?(%w[any all true])
|
||||
relation = relation.where.not("posts.id": disapprovals)
|
||||
else
|
||||
relation = relation.where.not("posts.id": disapprovals.where(reason: disapproval))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if q[:flagger_ids_neg]
|
||||
q[:flagger_ids_neg].each do |flagger_id|
|
||||
if CurrentUser.can_view_flagger?(flagger_id)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
class Tag < ApplicationRecord
|
||||
COSINE_SIMILARITY_RELATED_TAG_THRESHOLD = 300
|
||||
METATAGS = "-user|user|-approver|approver|commenter|comm|noter|noteupdater|artcomm|-pool|pool|ordpool|-favgroup|favgroup|-fav|fav|ordfav|md5|-rating|rating|-locked|locked|width|height|mpixels|ratio|score|favcount|filesize|source|-source|id|-id|date|age|order|limit|-status|status|tagcount|parent|-parent|child|pixiv_id|pixiv|search|upvote|downvote|filetype|-filetype|flagger|-flagger|appealer|-appealer|" +
|
||||
METATAGS = "-user|user|-approver|approver|commenter|comm|noter|noteupdater|artcomm|-pool|pool|ordpool|-favgroup|favgroup|-fav|fav|ordfav|md5|-rating|rating|-locked|locked|width|height|mpixels|ratio|score|favcount|filesize|source|-source|id|-id|date|age|order|limit|-status|status|tagcount|parent|-parent|child|pixiv_id|pixiv|search|upvote|downvote|filetype|-filetype|flagger|-flagger|appealer|-appealer|disapproval|-disapproval|" +
|
||||
TagCategory.short_name_list.map {|x| "#{x}tags"}.join("|")
|
||||
SUBQUERY_METATAGS = "commenter|comm|noter|noteupdater|artcomm|flagger|-flagger|appealer|-appealer"
|
||||
has_one :wiki_page, :foreign_key => "title", :primary_key => "name"
|
||||
@@ -577,6 +577,14 @@ class Tag < ApplicationRecord
|
||||
user_id = User.name_to_id(g2)
|
||||
q[:artcomm_ids] << user_id unless user_id.blank?
|
||||
|
||||
when "disapproval"
|
||||
q[:disapproval] ||= []
|
||||
q[:disapproval] << g2
|
||||
|
||||
when "-disapproval"
|
||||
q[:disapproval_neg] ||= []
|
||||
q[:disapproval_neg] << g2
|
||||
|
||||
when "-pool"
|
||||
if g2.downcase == "none"
|
||||
q[:pool] = "any"
|
||||
|
||||
@@ -2308,6 +2308,24 @@ class PostTest < ActiveSupport::TestCase
|
||||
end
|
||||
end
|
||||
|
||||
should "return posts for a disapproval:<type> metatag" do
|
||||
CurrentUser.scoped(FactoryBot.create(:mod_user)) do
|
||||
pending = FactoryBot.create(:post, is_pending: true)
|
||||
disapproved = FactoryBot.create(:post, is_pending: true)
|
||||
disapproval = FactoryBot.create(:post_disapproval, post: disapproved, reason: "disinterest")
|
||||
|
||||
assert_tag_match([pending], "disapproval:none")
|
||||
assert_tag_match([disapproved], "disapproval:any")
|
||||
assert_tag_match([disapproved], "disapproval:disinterest")
|
||||
assert_tag_match([], "disapproval:breaks_rules")
|
||||
|
||||
assert_tag_match([disapproved], "-disapproval:none")
|
||||
assert_tag_match([pending], "-disapproval:any")
|
||||
assert_tag_match([pending], "-disapproval:disinterest")
|
||||
assert_tag_match([disapproved, pending], "-disapproval:breaks_rules")
|
||||
end
|
||||
end
|
||||
|
||||
should "return posts ordered by a particular attribute" do
|
||||
posts = (1..2).map do |n|
|
||||
tags = ["tagme", "gentag1 gentag2 artist:arttag char:chartag copy:copytag"]
|
||||
|
||||
Reference in New Issue
Block a user