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

search: fix noteupdater: vs -noteupdater: mixup.

Browse Source
This commit is contained in:
evazion
2020-04-28 01:35:34 -05:00
parent b1c494aa34
commit dc144f7d7d
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/logical/post_query_builder.rb
View File

@@ -256,9 +256,9 @@ class PostQueryBuilder
when "-noter" when "-noter"
user_subquery_matches(NoteVersion.unscoped.where(version: 1), value, field: :updater).negate user_subquery_matches(NoteVersion.unscoped.where(version: 1), value, field: :updater).negate
when "noteupdater" when "noteupdater"
user_subquery_matches(NoteVersion.unscoped, value, field: :updater).negate
when "-noteupdater"
user_subquery_matches(NoteVersion.unscoped, value, field: :updater) user_subquery_matches(NoteVersion.unscoped, value, field: :updater)
when "-noteupdater"
user_subquery_matches(NoteVersion.unscoped, value, field: :updater).negate
when "upvoter", "upvote" when "upvoter", "upvote"
user_subquery_matches(PostVote.positive.visible(CurrentUser.user), value, field: :user) user_subquery_matches(PostVote.positive.visible(CurrentUser.user), value, field: :user)
when "-upvoter", "-upvote" when "-upvoter", "-upvote"

12
test/unit/post_query_builder_test.rb
View File

@@ -380,6 +380,18 @@ class PostQueryBuilderTest < ActiveSupport::TestCase
assert_tag_match([], "noter:none") assert_tag_match([], "noter:none")
end end
should "return posts for the noteupdater:<name> metatag" do
user1 = create(:user)
user2 = create(:user)
note1 = as(user1) { create(:note) }
note2 = as(user2) { create(:note) }
assert_tag_match([note1.post], "noteupdater:#{user1.name}")
assert_tag_match([note2.post], "noteupdater:#{user2.name}")
assert_tag_match([note2.post], "-noteupdater:#{user1.name}")
assert_tag_match([note1.post], "-noteupdater:#{user2.name}")
end
should "return posts for the note_count:<N> metatag" do should "return posts for the note_count:<N> metatag" do
posts = create_list(:post, 3) posts = create_list(:post, 3)
create(:note, post: posts[0], is_active: true) create(:note, post: posts[0], is_active: true)