From b4a67331ce845c44e4b69b1b45e08c1e8f9b40bd Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Wed, 5 Oct 2022 01:25:26 -0500
Subject: [PATCH] posts: remove sidebar for banned searches.

---
 app/logical/post_sets/post.rb  | 5 ++++-
 app/views/posts/index.html.erb | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/logical/post_sets/post.rb b/app/logical/post_sets/post.rb
index d17225707..355be2c32 100644
--- a/app/logical/post_sets/post.rb
+++ b/app/logical/post_sets/post.rb
@@ -112,6 +112,7 @@ module PostSets
 
     # @return [Integer, nil] The number of posts returned by the search, or nil if unknown.
     def post_count
+      return 0 if artist.present? && artist.is_banned? && !current_user.is_approver?
       normalized_query.post_count
     end
 
@@ -161,7 +162,9 @@ module PostSets
 
     concerning :TagListMethods do
       def related_tags
-        if normalized_query.wildcards.one? && normalized_query.tags.none?
+        if artist.present? && artist.is_banned? && !current_user.is_approver?
+          []
+        elsif normalized_query.wildcards.one? && normalized_query.tags.none?
           wildcard_tags
         elsif normalized_query.is_metatag?(:search)
           saved_search_tags
diff --git a/app/views/posts/index.html.erb b/app/views/posts/index.html.erb
index 20f59c30c..1adc37818 100644
--- a/app/views/posts/index.html.erb
+++ b/app/views/posts/index.html.erb
@@ -105,7 +105,7 @@
   </div>
 
   <div id="excerpt" style="display: none;">
-    <% if @post_set.artist.present? && @post_set.artist.is_banned? && !policy(@post_set.artist).can_view_banned? %>
+    <% if @post_set.artist.present? && @post_set.artist.is_banned? && !CurrentUser.user.is_approver? %>
       <p>The artist requested removal of this page.</p>
     <% elsif @post_set.artist.present? %>
       <%= render "artists/summary", artist: @post_set.artist %>
@@ -172,8 +172,8 @@
       <% gallery.footer do %>
         <% if @post_set.hidden_posts.present? %>
           <div class="fineprint hidden-posts-notice">
-            <% if @post_set.banned_posts.present? %>
-              <%= @post_set.banned_posts.size %> post(s) were removed from this page at the artist's request (<%= link_to_wiki "learn more", "banned_artist" %>).<br>
+            <% if @post_set.banned_posts.size == @post_set.posts.size %>
+              This page was removed from this page at the artist's request (<%= link_to_wiki "learn more", "banned_artist" %>).<br>
             <% end %>
 
             <% if @post_set.censored_posts.present? %>