Merge remote-tracking branch 'parent/main' into upstream-20240417

app/controllers/accounts_controller.rb

@@ -46,9 +46,11 @@ class AccountsController < ApplicationController
   end
 
   def default_statuses
-    visibilities = [:public, :unlisted, :public_unlisted]
-    visibilities << :login unless current_account.nil?
-    @account.statuses.where(visibility: visibilities)
+    if current_account.present?
+      @account.statuses.distributable_visibility
+    else
+      @account.statuses.distributable_visibility_for_anonymous
+    end
   end
 
   def only_media_scope

app/controllers/activitypub/replies_controller.rb

@@ -31,7 +31,7 @@ class ActivityPub::RepliesController < ActivityPub::BaseController
 
   def set_replies
     @replies = only_other_accounts? ? Status.where.not(account_id: @account.id).joins(:account).merge(Account.without_suspended) : @account.statuses
-    @replies = @replies.where(in_reply_to_id: @status.id, visibility: [:public, :unlisted, :public_unlisted, :login])
+    @replies = @replies.distributable_visibility.where(in_reply_to_id: @status.id)
     @replies = @replies.paginate_by_min_id(DESCENDANTS_LIMIT, params[:min_id])
   end
 

app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb

@@ -23,7 +23,7 @@ class Api::V1::Statuses::RebloggedByAccountsController < Api::V1::Statuses::Base
   end
 
   def paginated_statuses
-    Status.where(reblog_of_id: @status.id).where(visibility: [:public, :unlisted, :public_unlisted, :login]).paginate_by_max_id(
+    Status.where(reblog_of_id: @status.id).distributable_visibility.paginate_by_max_id(
       limit_param(DEFAULT_ACCOUNTS_LIMIT),
       params[:max_id],
       params[:since_id]