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

modqueue: fix the disapproved: metatag showing posts outside the queue.

Browse Source 
Fix a bug where filtering the modqueue by the `disapproved:<reason>` tag
would return posts outside the modqueue.
This commit is contained in:
evazion
2022-09-29 22:30:14 -05:00
parent d51cc17eaf
commit 559bf1ae0a
4 changed files with 49 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
test/unit/post_query_builder_test.rb
View File

@@ -1,8 +1,8 @@
require 'test_helper'
class PostQueryBuilderTest < ActiveSupport::TestCase
def assert_tag_match(posts, query, current_user: CurrentUser.user, tag_limit: nil, **options)
assert_equal(posts.map(&:id), Post.user_tag_match(query, current_user, tag_limit: tag_limit, **options).pluck("posts.id"))
def assert_tag_match(posts, query, relation: Post.all, current_user: CurrentUser.user, tag_limit: nil, **options)
assert_equal(posts.map(&:id), relation.user_tag_match(query, current_user, tag_limit: tag_limit, **options).pluck("posts.id"))
end
def assert_search_error(query, current_user: CurrentUser.user, **options)
@@ -1481,6 +1481,25 @@ class PostQueryBuilderTest < ActiveSupport::TestCase
assert_tag_match([post2, post1], "id:#{post1.id} or rating:q")
end
should "work on a relation with pre-existing scopes" do
post1 = create(:post, rating: "g", is_pending: true, tag_string: ["1girl"])
post2 = create(:post, rating: "s", is_flagged: true, tag_string: ["1boy"])
create(:post_disapproval, post: post2, reason: "poor_quality")
assert_tag_match([post1], "1girl", relation: Post.pending)
assert_tag_match([post1], "1girl", relation: Post.in_modqueue)
assert_tag_match([post1], "1boy", relation: Post.in_modqueue)
assert_tag_match([post2, post1], "comments:0", relation: Post.in_modqueue)
assert_tag_match([post2, post1], "comments:0 notes:0", relation: Post.in_modqueue)
assert_tag_match([post2], "-1girl", relation: Post.in_modqueue)
assert_tag_match([post2], "disapproved:poor_quality", relation: Post.in_modqueue)
assert_tag_match([], "rating:g", relation: Post.where(rating: "e"))
assert_tag_match([], "id:#{post1.id}", relation: Post.where(id: 0))
assert_tag_match([], "order:artcomm", relation: Post.in_modqueue)
end
should "not allow conflicting order metatags" do
assert_search_error("order:score ordfav:a")
assert_search_error("order:score ordfavgroup:a")