Merge pull request #3145 from r888888888/flagger_metatag

Add "flagger:" and "appealer:" metatags (fixes #3142)

app/models/post_event.rb

@@ -24,6 +24,16 @@ class PostEvent
     type_name.first
   end
 
+  def is_creator_visible?(user = CurrentUser.user)
+    case event
+    when PostAppeal
+      true
+    when PostFlag
+      flag = event
+      user.can_view_flagger?(flag.creator_id)
+    end
+  end
+
   def attributes
     {
       "creator_id": nil,

app/models/post_flag.rb

@@ -73,12 +73,15 @@ class PostFlag < ActiveRecord::Base
         q = q.reason_matches(params[:reason_matches])
       end
 
-      if params[:creator_id].present? && (CurrentUser.is_moderator? || params[:creator_id].to_i == CurrentUser.user.id)
+      if params[:creator_id].present? && CurrentUser.can_view_flagger?(params[:creator_id].to_i)
         q = q.where("creator_id = ?", params[:creator_id].to_i)
       end
 
-      if params[:creator_name].present? && (CurrentUser.is_moderator? || params[:creator_name].mb_chars.downcase.strip.tr(" ", "_") == CurrentUser.user.name.downcase)
-        q = q.where("creator_id = (select _.id from users _ where lower(_.name) = ?)", params[:creator_name].mb_chars.downcase.strip.tr(" ", "_"))
+      if params[:creator_name].present?
+        flagger_id = User.name_to_id(params[:creator_name].strip)
+        if CurrentUser.can_view_flagger?(flagger_id)
+          q = q.where("creator_id = ?", flagger_id)
+        end
       end
 
       if params[:post_id].present?

app/models/tag.rb

@@ -1,7 +1,7 @@
 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|upvote|downvote|filetype|-filetype"
-  SUBQUERY_METATAGS = "commenter|comm|noter|noteupdater|artcomm"
+  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|filetype|-filetype|flagger|-flagger|appealer|-appealer"
+  SUBQUERY_METATAGS = "commenter|comm|noter|noteupdater|artcomm|flagger|-flagger|appealer|-appealer"
   attr_accessible :category, :as => [:moderator, :gold, :platinum, :member, :anonymous, :default, :builder, :admin]
   attr_accessible :is_locked, :as => [:moderator, :admin]
   has_one :wiki_page, :foreign_key => "title", :primary_key => "name"
@@ -442,7 +442,7 @@ class Tag < ActiveRecord::Base
 
           when "approver"
             if $2 == "none"
-              q[:approver_id] = "none"              
+              q[:approver_id] = "none"
             elsif $2 == "any"
               q[:approver_id] = "any"
             else
@@ -450,6 +450,40 @@ class Tag < ActiveRecord::Base
               q[:approver_id] = user_id unless user_id.blank?
             end
 
+          when "flagger"
+            q[:flagger_ids] ||= []
+
+            if $2 == "none"
+              q[:flagger_ids] << "none"
+            elsif $2 == "any"
+              q[:flagger_ids] << "any"
+            else
+              user_id = User.name_to_id($2)
+              q[:flagger_ids] << user_id unless user_id.blank?
+            end
+
+          when "-flagger"
+            q[:flagger_ids_neg] ||= []
+            user_id = User.name_to_id($2)
+            q[:flagger_ids_neg] << user_id unless user_id.blank?
+
+          when "appealer"
+            q[:appealer_ids] ||= []
+
+            if $2 == "none"
+              q[:appealer_ids] << "none"
+            elsif $2 == "any"
+              q[:appealer_ids] << "any"
+            else
+              user_id = User.name_to_id($2)
+              q[:appealer_ids] << user_id unless user_id.blank?
+            end
+
+          when "-appealer"
+            q[:appealer_ids_neg] ||= []
+            user_id = User.name_to_id($2)
+            q[:appealer_ids_neg] << user_id unless user_id.blank?
+
           when "commenter", "comm"
             q[:commenter_ids] ||= []
 

app/models/user.rb

@@ -545,6 +545,10 @@ class User < ActiveRecord::Base
       created_at <= 1.week.ago
     end
 
+    def can_view_flagger?(flagger_id)
+      is_moderator? || flagger_id == id
+    end
+
     def base_upload_limit
       if created_at >= 1.month.ago
         10