From f0c2dcf6175c1aff5e6a21364c21acff71b5df8d Mon Sep 17 00:00:00 2001 From: Fire Demon Date: Tue, 18 Aug 2020 15:35:54 -0500 Subject: [Privacy] Restrict visibility of replies to private threads --- app/models/status.rb | 11 +++-------- 1 file 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 -- cgit