Add (currently unused) setting for default quote policy (#34623)

This commit is contained in:
Claire 2025-05-13 13:47:38 +02:00 committed by GitHub
parent f993d7578b
commit 5305e939c4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 18 additions and 0 deletions

View file

@ -15,6 +15,7 @@ class UserSettings
setting :default_language, default: nil setting :default_language, default: nil
setting :default_sensitive, default: false setting :default_sensitive, default: false
setting :default_privacy, default: nil, in: %w(public unlisted private) setting :default_privacy, default: nil, in: %w(public unlisted private)
setting :default_quote_policy, default: 'public', in: %w(public followers nobody)
setting_inverse_alias :indexable, :noindex setting_inverse_alias :indexable, :noindex

View file

@ -38,6 +38,17 @@
required: false, required: false,
wrapper: :with_label wrapper: :with_label
.fields-row
.fields-group.fields-row__column.fields-row__column-6
= ff.input :default_quote_policy,
collection: %w(public followers nobody),
include_blank: false,
label_method: ->(policy) { I18n.t("statuses.quote_policies.#{policy}") },
label: I18n.t('simple_form.labels.defaults.setting_default_quote_policy'),
hint: I18n.t('simple_form.hints.defaults.setting_default_quote_policy'),
required: false,
wrapper: :with_label
.fields-group .fields-group
= ff.input :default_sensitive, = ff.input :default_sensitive,
hint: I18n.t('simple_form.hints.defaults.setting_default_sensitive'), hint: I18n.t('simple_form.hints.defaults.setting_default_sensitive'),

View file

@ -1859,6 +1859,10 @@ en:
limit: You have already pinned the maximum number of posts limit: You have already pinned the maximum number of posts
ownership: Someone else's post cannot be pinned ownership: Someone else's post cannot be pinned
reblog: A boost cannot be pinned reblog: A boost cannot be pinned
quote_policies:
followers: Followers and mentioned users
nobody: Only mentioned users
public: Everyone
title: '%{name}: "%{quote}"' title: '%{name}: "%{quote}"'
visibilities: visibilities:
direct: Direct direct: Direct

View file

@ -56,6 +56,7 @@ en:
scopes: Which APIs the application will be allowed to access. If you select a top-level scope, you don't need to select individual ones. scopes: Which APIs the application will be allowed to access. If you select a top-level scope, you don't need to select individual ones.
setting_aggregate_reblogs: Do not show new boosts for posts that have been recently boosted (only affects newly-received boosts) setting_aggregate_reblogs: Do not show new boosts for posts that have been recently boosted (only affects newly-received boosts)
setting_always_send_emails: Normally e-mail notifications won't be sent when you are actively using Mastodon setting_always_send_emails: Normally e-mail notifications won't be sent when you are actively using Mastodon
setting_default_quote_policy: Mentioned users are always allowed to quote. This setting will only take effect for posts created with the next Mastodon version, but you can select your preference in preparation
setting_default_sensitive: Sensitive media is hidden by default and can be revealed with a click setting_default_sensitive: Sensitive media is hidden by default and can be revealed with a click
setting_display_media_default: Hide media marked as sensitive setting_display_media_default: Hide media marked as sensitive
setting_display_media_hide_all: Always hide media setting_display_media_hide_all: Always hide media
@ -231,6 +232,7 @@ en:
setting_boost_modal: Show confirmation dialog before boosting setting_boost_modal: Show confirmation dialog before boosting
setting_default_language: Posting language setting_default_language: Posting language
setting_default_privacy: Posting privacy setting_default_privacy: Posting privacy
setting_default_quote_policy: Who can quote
setting_default_sensitive: Always mark media as sensitive setting_default_sensitive: Always mark media as sensitive
setting_delete_modal: Show confirmation dialog before deleting a post setting_delete_modal: Show confirmation dialog before deleting a post
setting_disable_hover_cards: Disable profile preview on hover setting_disable_hover_cards: Disable profile preview on hover