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

Merge pull request #3832 from evazion/feat-modqueue-metatags

Browse Source 
Add status:<unmoderated|modqueue>, disapproval:<type> metatags
This commit is contained in:
Albert Yi
2018-08-23 13:53:33 -07:00
committed by GitHub
parent 83cca4a382 4f02c7f70a
commit d8a6cee244
6 changed files with 87 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/post.rb
View File

@@ -1645,7 +1645,9 @@ class Post < ApplicationRecord
where("uploader_id = ?", user_id)
end
def available_for_moderation(hidden, user = CurrentUser.user)
def available_for_moderation(hidden = false, user = CurrentUser.user)
return none if user.is_anonymous?
approved_posts = user.post_approvals.select(:post_id)
disapproved_posts = user.post_disapprovals.select(:post_id)

10
app/models/tag.rb
View File

@@ -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"