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

Merge pull request #3145 from r888888888/flagger_metatag

Browse Source 
Add "flagger:" and "appealer:" metatags (fixes #3142)
This commit is contained in:
Albert Yi
2017-06-14 11:02:08 -07:00
committed by GitHub
parent ca2adac3f0 1ffc9d286c
commit f780b32012
9 changed files with 114 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/post_flag.rb
View File

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