* #609 ローカルユーザー設定から購読許可を削除 * Fix test * Fix test
This commit is contained in:
parent
ec60b68608
commit
0c37295624
16 changed files with 34 additions and 146 deletions
|
@ -5,6 +5,8 @@ module Account::MasterSettings
|
|||
|
||||
included do
|
||||
def subscription_policy
|
||||
return :allow if local?
|
||||
|
||||
return master_settings['subscription_policy']&.to_sym || :allow if master_settings.present?
|
||||
|
||||
# allow, followers_only, block
|
||||
|
|
|
@ -143,10 +143,6 @@ module User::HasSettings
|
|||
settings['dtl_force_searchability']&.to_sym || :unchange
|
||||
end
|
||||
|
||||
def setting_dtl_force_subscribable
|
||||
settings['dtl_force_subscribable']
|
||||
end
|
||||
|
||||
def setting_hide_statuses_count
|
||||
settings['hide_statuses_count']
|
||||
end
|
||||
|
|
|
@ -39,7 +39,6 @@ class UserSettings
|
|||
setting :slip_local_emoji_reaction, default: false
|
||||
setting :dtl_force_visibility, default: :unchange, in: %w(unchange public public_unlisted unlisted)
|
||||
setting :dtl_force_searchability, default: :unchange, in: %w(unchange public public_unlisted)
|
||||
setting :dtl_force_subscribable, default: false
|
||||
setting :lock_follow_from_bot, default: false
|
||||
setting :allow_quote, default: true
|
||||
setting :reject_send_limited_to_suspects, default: false
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue