From dc5526f4ae8c9d3a6f132b2bc72914b95e5286cc Mon Sep 17 00:00:00 2001 From: Fire Demon Date: Sat, 18 Jul 2020 23:59:04 -0500 Subject: [Privacy, Federation, UI] Add options to allow Fediverse users to decide whether to include replies and unlisted posts on their profiles --- app/controllers/accounts_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/controllers/accounts_controller.rb') diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 21209cf12..81b8f8985 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -69,12 +69,12 @@ class AccountsController < ApplicationController default_statuses.tap do |statuses| statuses.merge!(hashtag_scope) if tag_requested? statuses.merge!(only_media_scope) if media_requested? - statuses.merge!(no_replies_scope) unless (current_account&.id == @account.id) && replies_requested? + statuses.merge!(no_replies_scope) unless (current_account&.id == @account.id || @account.show_replies?) && replies_requested? end end def default_statuses - visibility_scopes = user_signed_in? ? [:public, :unlisted] : :public + visibility_scopes = user_signed_in? || @account.show_unlisted? ? [:public, :unlisted] : :public @account.statuses.not_local_only.where(visibility: visibility_scopes) end -- cgit