tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pull user settings defaults from configuration (#38592)

Browse Source
This commit is contained in:
Matt Jankowski 2026-04-17 04:31:37 -04:00 committed by GitHub
parent d5f0e37260
commit 3411d06f9e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/settings_helper.rb
View File

@ -23,6 +23,10 @@ module SettingsHelper
)
end
def user_settings_collection(value)
UserSettings.definition_for(value)&.in || []
end
def author_attribution_name(account)
return if account.nil?

8
app/views/settings/preferences/appearance/show.html.haml
View File

@ -36,7 +36,7 @@
.input.horizontal-options
= ff.input :'web.color_scheme',
as: :radio_buttons,
collection: %w(auto light dark),
collection: user_settings_collection('web.color_scheme'),
include_blank: false,
label: I18n.t('simple_form.labels.defaults.setting_color_scheme'),
label_method: ->(contrast) { I18n.t("color_scheme.#{contrast}", default: contrast) },
@ -45,7 +45,7 @@
.input.horizontal-options
= ff.input :'web.contrast',
as: :radio_buttons,
collection: %w(auto high),
collection: user_settings_collection('web.contrast'),
include_blank: false,
label: I18n.t('simple_form.labels.defaults.setting_contrast'),
label_method: ->(contrast) { I18n.t("contrast.#{contrast}", default: contrast) },
@ -55,7 +55,7 @@
.fields-group
= f.simple_fields_for :settings, current_user.settings do |ff|
= ff.input :'web.emoji_style',
collection: %w(auto twemoji native),
collection: user_settings_collection('web.emoji_style'),
include_blank: false,
hint: I18n.t('simple_form.hints.defaults.setting_emoji_style'),
label: I18n.t('simple_form.labels.defaults.setting_emoji_style'),
@ -110,7 +110,7 @@
= ff.input :'web.display_media',
as: :radio_buttons,
collection_wrapper_tag: 'ul',
collection: %w(default show_all hide_all),
collection: user_settings_collection('web.display_media'),
hint: false,
item_wrapper_tag: 'li',
label_method: ->(item) { t("simple_form.hints.defaults.setting_display_media_#{item}") },

2
app/views/settings/preferences/notifications/show.html.haml
View File

@ -35,7 +35,7 @@
- if SoftwareUpdate.check_enabled? && current_user.can?(:view_devops)
.fields-group
= ff.input :'notification_emails.software_updates',
collection: %w(none critical patch all),
collection: user_settings_collection('notification_emails.software_updates'),
hint: false,
include_blank: false,
label_method: ->(setting) { I18n.t("simple_form.labels.notification_emails.software_updates.#{setting}") },

2
app/views/settings/preferences/posting_defaults/show.html.haml
View File

@ -26,7 +26,7 @@
.fields-group
= ff.input :default_quote_policy,
collection: %w(public followers nobody),
collection: user_settings_collection('default_quote_policy'),
include_blank: false,
label_method: ->(policy) { I18n.t("statuses.quote_policies.#{policy}") },
label: I18n.t('simple_form.labels.defaults.setting_default_quote_policy'),

16
spec/helpers/settings_helper_spec.rb
View File

@ -3,6 +3,22 @@
require 'rails_helper'
RSpec.describe SettingsHelper do
describe '#user_settings_collection' do
subject { helper.user_settings_collection(value) }
context 'with valid value' do
let(:value) { 'web.contrast' }
it { is_expected.to eq(%w(auto high)) }
end
context 'with invalid value' do
let(:value) { 'web.nothing_at_this_key_at_all_fake_fake_fake' }
it { is_expected.to be_empty }
end
end
describe 'session_device_icon' do
context 'with a mobile device' do
let(:session) { SessionActivation.new(user_agent: 'Mozilla/5.0 (iPhone)') }