From fdf3b93c3658ba07144255516e2a50604d2b30d5 Mon Sep 17 00:00:00 2001 From: KMY Date: Wed, 5 Apr 2023 14:36:15 +0900 Subject: [PATCH] Fix search policy --- app/policies/status_policy.rb | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/app/policies/status_policy.rb b/app/policies/status_policy.rb index 81e60fccba..74709647a8 100644 --- a/app/policies/status_policy.rb +++ b/app/policies/status_policy.rb @@ -20,7 +20,15 @@ class StatusPolicy < ApplicationPolicy end def search? - show? && (record.public_visibility? || record.public_unlisted_visibility?) + return false if author.suspended? + + if requires_mention? + owned? || mention_exists? + elsif !public? + owned? || following_author? || mention_exists? + else + current_account.nil? || (!author_blocking? && !author_blocking_domain?) + end end def reblog? @@ -59,6 +67,10 @@ class StatusPolicy < ApplicationPolicy record.private_visibility? end + def public? + record.public_visibility? || record.public_unlisted_visibility? + end + def mention_exists? return false if current_account.nil?