[Privacy] Restrict visibility of replies to private threads

1 files changed, 3 insertions, 8 deletions

diff --git a/app/models/status.rb b/app/models/status.rb
index 68093eb73..36b3eecf4 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -582,14 +582,9 @@ class Status < ApplicationRecord
           query = query.without_reblogs
         end
 
-        query = if options[:only_replies]
-                  query.replies
-                elsif options[:include_replies]
-                  if target_account.present?
-                    query.public_conversations.or(query.conversations_by(target_account))
-                  else
-                    query.public_conversations
-                  end
+        query = if options[:include_replies]
+                  query = query.replies if options[:only_replies]
+                  query.public_conversations.or(query.conversations_by(target_account))
                 else
                   query.without_replies
                 end