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

Fix #3468: Approval queue should not show one's own uploads or previous approvals.

Browse Source
This commit is contained in:
evazion
2017-12-28 19:33:50 -06:00
parent 1ca2497015
commit 3e936748c0
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/post.rb
View File

@@ -1646,11 +1646,14 @@ class Post < ApplicationRecord
where("uploader_id = ?", user_id)
end
def available_for_moderation(hidden)
def available_for_moderation(hidden, user = CurrentUser.user)
approved_posts = user.post_approvals.select(:post_id)
disapproved_posts = user.post_disapprovals.select(:post_id)
if hidden.present?
where("posts.id IN (SELECT pd.post_id FROM post_disapprovals pd WHERE pd.user_id = ?)", CurrentUser.id)
where("posts.uploader_id = ? OR posts.id IN (#{approved_posts.to_sql}) OR posts.id IN (#{disapproved_posts.to_sql})", user.id)
else
where("posts.id NOT IN (SELECT pd.post_id FROM post_disapprovals pd WHERE pd.user_id = ?)", CurrentUser.id)
where.not(uploader: user).where.not(id: approved_posts).where.not(id: disapproved_posts)
end
end