[Privacy] Use reply visibility gating to preserve thread permissions rather than public/private flag on thread

1 files changed, 3 insertions, 10 deletions

diff --git a/app/policies/status_policy.rb b/app/policies/status_policy.rb
index b92494103..9f851feb3 100644
--- a/app/policies/status_policy.rb
+++ b/app/policies/status_policy.rb
@@ -53,7 +53,7 @@ class StatusPolicy < ApplicationPolicy
   end
 
   def private?
-    visibility_for_remote_domain == 'private' || reply? && !public_conversation?
+    visibility_for_remote_domain == 'private'
   end
 
   def mention_exists?
@@ -91,7 +91,7 @@ class StatusPolicy < ApplicationPolicy
   end
 
   def conversation_author_blocking?
-    return public_conversation? if conversation_owner.nil?
+    return false if conversation_owner.nil?
 
     @preloaded_relations[:blocked_by] ? @preloaded_relations[:blocked_by][conversation_owner.id] : conversation_owner.blocking?(current_account)
   end
@@ -110,8 +110,7 @@ class StatusPolicy < ApplicationPolicy
   end
 
   def following_conversation_owner?
-    return false if current_account.nil?
-    return public_conversation? if conversation_owner.nil?
+    return false if current_account.nil? || conversation_owner.nil?
 
     @preloaded_relations[:following] ? @preloaded_relations[:following][conversation_owner.id] : current_account.following?(conversation_owner)
   end
@@ -142,12 +141,6 @@ class StatusPolicy < ApplicationPolicy
     record.reply? && record.in_reply_to_account_id != author.id
   end
 
-  def public_conversation?
-    return @public_conversation if defined?(@public_conversation)
-
-    @public_conversation = record.conversation&.public? || false
-  end
-
   def visibility_for_remote_domain
     @visibility_for_domain ||= record.visibility_for_domain(current_account&.domain)
   end