From c10176e64d670405764a0b51330954ad9e4cd577 Mon Sep 17 00:00:00 2001 From: r888888888 Date: Thu, 8 Sep 2016 17:48:50 -0700 Subject: [PATCH] add upvote and downvote metatags --- app/logical/post_query_builder.rb | 12 ++++++++++++ app/logical/reports/user_similarity.rb | 2 +- app/models/super_voter.rb | 2 +- app/models/tag.rb | 12 +++++++++++- 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/app/logical/post_query_builder.rb b/app/logical/post_query_builder.rb index da0d0bbae..ad456a01d 100644 --- a/app/logical/post_query_builder.rb +++ b/app/logical/post_query_builder.rb @@ -348,6 +348,18 @@ class PostQueryBuilder end end + if q[:upvote].present? + user_id = q[:upvote] + post_ids = PostVote.where(:user_id => user_id).where("score > 0").limit(400).pluck(:post_id) + relation = relation.where("posts.id in (?)", post_ids) + end + + if q[:downvote].present? + user_id = q[:downvote] + post_ids = PostVote.where(:user_id => user_id).where("score < 0").limit(400).pluck(:post_id) + relation = relation.where("posts.id in (?)", post_ids) + end + if q[:ordfav].present? user_id = q[:ordfav].to_i user = User.find(user_id) diff --git a/app/logical/reports/user_similarity.rb b/app/logical/reports/user_similarity.rb index c59637bb9..9b56a5819 100644 --- a/app/logical/reports/user_similarity.rb +++ b/app/logical/reports/user_similarity.rb @@ -12,7 +12,7 @@ module Reports User.find(user_id) end - def prime_similar_users(endpoint = "user_similarity") + def prime(endpoint = "user_similarity") 10.times do result = fetch_similar_user_ids(endpoint) if result == NOT_READY_STRING diff --git a/app/models/super_voter.rb b/app/models/super_voter.rb index 5a664dcc1..51e7b35d3 100644 --- a/app/models/super_voter.rb +++ b/app/models/super_voter.rb @@ -14,7 +14,7 @@ class SuperVoter < ActiveRecord::Base def self.init! prune! report = Reports::UserSimilarity.new(User.admins.first.id) - report.prime_similar_users("post_vote_similarity") + report.prime("post_vote_similarity") report.result.scan(/\S+/).in_groups_of(2).each do |user_id, score| unless where("user_id = ?", user_id.to_i).exists? diff --git a/app/models/tag.rb b/app/models/tag.rb index b5bd32ef4..34610f64b 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -1,6 +1,6 @@ class Tag < ActiveRecord::Base COSINE_SIMILARITY_RELATED_TAG_THRESHOLD = 1000 - METATAGS = "-user|user|-approver|approver|commenter|comm|noter|noteupdater|artcomm|-pool|pool|ordpool|-favgroup|favgroup|-fav|fav|ordfav|sub|md5|-rating|rating|-locked|locked|width|height|mpixels|ratio|score|favcount|filesize|source|-source|id|-id|date|age|order|limit|-status|status|tagcount|gentags|arttags|chartags|copytags|parent|-parent|child|pixiv_id|pixiv|search" + METATAGS = "-user|user|-approver|approver|commenter|comm|noter|noteupdater|artcomm|-pool|pool|ordpool|-favgroup|favgroup|-fav|fav|ordfav|sub|md5|-rating|rating|-locked|locked|width|height|mpixels|ratio|score|favcount|filesize|source|-source|id|-id|date|age|order|limit|-status|status|tagcount|gentags|arttags|chartags|copytags|parent|-parent|child|pixiv_id|pixiv|search|upvote|downvote" SUBQUERY_METATAGS = "commenter|comm|noter|noteupdater|artcomm" attr_accessible :category, :as => [:moderator, :janitor, :gold, :member, :anonymous, :default, :builder, :admin] attr_accessible :is_locked, :as => [:moderator, :admin] @@ -591,6 +591,16 @@ class Tag < ActiveRecord::Base when "pixiv_id", "pixiv" q[:pixiv_id] = parse_helper($2) + when "upvote" + if CurrentUser.user.is_janitor? + q[:upvote] = User.name_to_id($2) + end + + when "downvote" + if CurrentUser.user.is_janitor? + q[:downvote] = User.name_to_id($2) + end + end else