From 4215d5ed8640a4ca66c20260392bcd1f472e863b Mon Sep 17 00:00:00 2001 From: evazion Date: Wed, 24 Aug 2022 16:05:34 -0500 Subject: [PATCH] Fix #5233: is: metatags don't show deleted posts if relevant. Fix thumbnails of deleted posts still being hidden when searching for `is:deleted`. --- app/logical/post_query.rb | 8 +------- app/logical/post_sets/post.rb | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/logical/post_query.rb b/app/logical/post_query.rb index 5bf0e2f47..cccd729d8 100644 --- a/app/logical/post_query.rb +++ b/app/logical/post_query.rb @@ -201,12 +201,6 @@ class PostQuery [AST.metatag("rating", "g"), *tags] end - # XXX unify with PostSets::Post#show_deleted? - def hide_deleted? - has_status_metatag = select_metatags(:status).any? { |metatag| metatag.value.downcase.in?(%w[deleted active any all unmoderated modqueue appealed]) } - !has_status_metatag - end - concerning :CountMethods do # @return [Integer, nil] The number of posts returned by the search, or nil on timeout. def post_count @@ -305,5 +299,5 @@ class PostQuery end end - memoize :tags, :replace_aliases, :with_implicit_metatags, :to_cnf, :aliases, :implicit_metatags, :hide_deleted?, :term_count + memoize :tags, :replace_aliases, :with_implicit_metatags, :to_cnf, :aliases, :implicit_metatags, :term_count end diff --git a/app/logical/post_sets/post.rb b/app/logical/post_sets/post.rb index b8f16a543..d17225707 100644 --- a/app/logical/post_sets/post.rb +++ b/app/logical/post_sets/post.rb @@ -142,7 +142,7 @@ module PostSets end def has_status_metatag? - post_query.select_metatags("status").any? do |metatag| + post_query.select_metatags("is", "status").any? do |metatag| metatag.value.downcase.in?(%w[all any active unmoderated modqueue deleted appealed]) end end