From b2d12e2e20fe71743d12dd04e13548d19ac71c83 Mon Sep 17 00:00:00 2001 From: BrokenEagle Date: Fri, 17 Jan 2020 06:08:13 +0000 Subject: [PATCH] Remove posts not shown for blank message check --- app/presenters/post_set_presenters/base.rb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/presenters/post_set_presenters/base.rb b/app/presenters/post_set_presenters/base.rb index 402844d12..1a76c8b42 100644 --- a/app/presenters/post_set_presenters/base.rb +++ b/app/presenters/post_set_presenters/base.rb @@ -6,8 +6,7 @@ module PostSetPresenters def post_previews_html(template, options = {}) html = "" - - if posts.empty? + if none_shown(options) return template.render("post_sets/blank") end @@ -18,5 +17,13 @@ module PostSetPresenters html.html_safe end + + def not_shown(post, options) + !options[:show_deleted] && post.is_deleted? && @post_set.tag_string !~ /status:(?:all|any|deleted|banned)/ && !@post_set.raw + end + + def none_shown(options) + posts.reject {|post| not_shown(post, options) }.empty? + end end end