diff --git a/app/models/artist.rb b/app/models/artist.rb index 8ad7e9be3..b81c66542 100644 --- a/app/models/artist.rb +++ b/app/models/artist.rb @@ -207,12 +207,7 @@ class Artist < ActiveRecord::Base CurrentUser.without_safe_mode do begin Post.tag_match(name).each do |post| - begin - post.flag!("Artist requested removal") - rescue PostFlag::Error - # swallow - end - post.delete!(:ban => true) + post.ban! end rescue Post::SearchError # swallow diff --git a/app/views/moderator/post/posts/confirm_delete.html.erb b/app/views/moderator/post/posts/confirm_delete.html.erb index ec7335ed7..38ec53a2a 100644 --- a/app/views/moderator/post/posts/confirm_delete.html.erb +++ b/app/views/moderator/post/posts/confirm_delete.html.erb @@ -14,6 +14,8 @@ <% end %> +

Note: If the reason you are planning to delete this post is because it is from a banned artist, please <%= link_to "ban", confirm_ban_moderator_post_post_path(@post) %> this post instead of deleting it.

+
<%= text_area_tag "reason" %> diff --git a/app/views/post_flags/_new.html.erb b/app/views/post_flags/_new.html.erb index 9d9f30624..df302b5d1 100644 --- a/app/views/post_flags/_new.html.erb +++ b/app/views/post_flags/_new.html.erb @@ -15,6 +15,7 @@

Enter a reason:

diff --git a/test/unit/artist_test.rb b/test/unit/artist_test.rb index 3d7a52756..8e404cc25 100644 --- a/test/unit/artist_test.rb +++ b/test/unit/artist_test.rb @@ -41,8 +41,8 @@ class ArtistTest < ActiveSupport::TestCase assert(@post.is_banned?) end - should "delete the post" do - assert(@post.is_deleted?) + should "not delete the post" do + refute(@post.is_deleted?) end should "create a new tag implication" do