Partial fix for #1520

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.ban!
-                post.flag!("Artist requested removal")
-              rescue PostFlag::Error
-                # swallow
-              end
-              post.delete!(:ban => true)
             end
           rescue Post::SearchError
             # swallow

app/views/moderator/post/posts/confirm_delete.html.erb

@@ -14,6 +14,8 @@
     </div>
   <% end %>
 
+  <p style="font-weight: bold;">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.</p>
+
   <div class="input">
     <label for="reason">Reason</label>
     <%= text_area_tag "reason" %>

app/views/post_flags/_new.html.erb

@@ -15,6 +15,7 @@
 
 <ul>
   <li>Duplicate: just parent to the original</li>
+  <li>Banned artist: request that a member of site staff ban this post instead</li>
 </ul>
 
 <p>Enter a reason:</p>

test/unit/artist_test.rb

@@ -41,8 +41,8 @@ class ArtistTest < ActiveSupport::TestCase
         assert(@post.is_banned?)
       end
 
-      should "delete the post" do
+      should "not delete the post" do
-        assert(@post.is_deleted?)
+        refute(@post.is_deleted?)
       end
 
       should "create a new tag implication" do