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

artists: fix ban/unban actions.

Browse Source 
Fix the ban! and unban! methods to:

* Lock the artist while it is being banned or unbanned.
* Perform the edits as a mass update, so that the posts are updated in parallel.
* Edit the artist as the banner rather than as the current user.
* Soft delete the banned_artist implication when an artist is unbanned instead of hard deleting it.
* Ignore the banned_artist implication if it's deleted.
This commit is contained in:
evazion
2022-11-20 18:33:15 -06:00
parent 01c6d11253
commit 4fd028a5ce
5 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/unit/artist_test.rb
View File

@@ -63,7 +63,7 @@ class ArtistTest < ActiveSupport::TestCase
@artist = FactoryBot.create(:artist, :name => "aaa")
@post = FactoryBot.create(:post, :tag_string => "aaa")
@admin = FactoryBot.create(:admin_user)
@artist.ban!(banner: @admin)
@artist.ban!(@admin)
perform_enqueued_jobs
@post.reload
end
@@ -72,15 +72,17 @@ class ArtistTest < ActiveSupport::TestCase
assert_equal(true, @artist.reload.is_banned?)
assert_equal(true, @post.reload.is_banned?)
assert_equal(true, @artist.versions.last.is_banned?)
assert_equal(true, TagImplication.active.exists?(antecedent_name: @artist.name, consequent_name: "banned_artist"))
assert_difference("TagImplication.count", -1) do
@artist.unban!
end
@artist.unban!(@admin)
assert_equal(false, @artist.reload.is_banned?)
assert_equal(false, @post.reload.is_banned?)
assert_equal(false, @artist.versions.last.is_banned?)
assert_equal("aaa", @post.tag_string)
assert_equal(false, TagImplication.active.exists?(antecedent_name: @artist.name, consequent_name: "banned_artist"))
assert_equal(true, TagImplication.deleted.exists?(antecedent_name: @artist.name, consequent_name: "banned_artist"))
assert_equal(true, ModAction.artist_unban.exists?(subject: @artist))
end
should "ban the post" do
@@ -106,8 +108,18 @@ class ArtistTest < ActiveSupport::TestCase
end
should "update the artist history" do
assert_equal(true, @artist.reload.is_banned?)
assert_equal(true, @artist.versions.last.is_banned?)
end
should "tag the posts" do
assert_equal(true, @post.reload.is_banned?)
assert_equal(true, @post.has_tag?("banned_artist"))
end
should "create a mod action" do
assert_equal(true, ModAction.artist_ban.exists?(subject: @artist))
end
end
should "normalize its name" do