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

posts: remove sidebar for banned searches.

Browse Source
This commit is contained in:
evazion
2022-10-05 01:25:26 -05:00
parent 24216379b7
commit b4a67331ce
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/logical/post_sets/post.rb
View File

@@ -112,6 +112,7 @@ module PostSets
# @return [Integer, nil] The number of posts returned by the search, or nil if unknown. # @return [Integer, nil] The number of posts returned by the search, or nil if unknown.
def post_count def post_count
return 0 if artist.present? && artist.is_banned? && !current_user.is_approver?
normalized_query.post_count normalized_query.post_count
end end
@@ -161,7 +162,9 @@ module PostSets
concerning :TagListMethods do concerning :TagListMethods do
def related_tags 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 wildcard_tags
elsif normalized_query.is_metatag?(:search) elsif normalized_query.is_metatag?(:search)
saved_search_tags saved_search_tags

6
app/views/posts/index.html.erb
View File

@@ -105,7 +105,7 @@
</div> </div>
<div id="excerpt" style="display: none;"> <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> <p>The artist requested removal of this page.</p>
<% elsif @post_set.artist.present? %> <% elsif @post_set.artist.present? %>
<%= render "artists/summary", artist: @post_set.artist %> <%= render "artists/summary", artist: @post_set.artist %>
@@ -172,8 +172,8 @@
<% gallery.footer do %> <% gallery.footer do %>
<% if @post_set.hidden_posts.present? %> <% if @post_set.hidden_posts.present? %>
<div class="fineprint hidden-posts-notice"> <div class="fineprint hidden-posts-notice">
<% if @post_set.banned_posts.present? %> <% if @post_set.banned_posts.size == @post_set.posts.size %>
<%= @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> This page was removed from this page at the artist's request (<%= link_to_wiki "learn more", "banned_artist" %>).<br>
<% end %> <% end %>
<% if @post_set.censored_posts.present? %> <% if @post_set.censored_posts.present? %>