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

This commit is contained in:
KMY 2024-04-17 12:51:32 +09:00
commit 51cf7b3eb4
76 changed files with 835 additions and 307 deletions

View file

@ -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