5085559b15
Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.
53 lines
1.3 KiB
Ruby
53 lines
1.3 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class Settings::PreferencesController < Settings::BaseController
|
|
def show; end
|
|
|
|
def update
|
|
user_settings.update(user_settings_params.to_h)
|
|
|
|
if current_user.update(user_params)
|
|
I18n.locale = current_user.locale
|
|
redirect_to settings_preferences_path, notice: I18n.t('generic.changes_saved_msg')
|
|
else
|
|
render :show
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def user_settings
|
|
UserSettingsDecorator.new(current_user)
|
|
end
|
|
|
|
def user_params
|
|
params.require(:user).permit(
|
|
:locale,
|
|
chosen_languages: []
|
|
)
|
|
end
|
|
|
|
def user_settings_params
|
|
params.require(:user).permit(
|
|
:setting_default_privacy,
|
|
:setting_default_sensitive,
|
|
:setting_default_language,
|
|
:setting_unfollow_modal,
|
|
:setting_boost_modal,
|
|
:setting_favourite_modal,
|
|
:setting_delete_modal,
|
|
:setting_auto_play_gif,
|
|
:setting_display_media,
|
|
:setting_expand_spoilers,
|
|
:setting_reduce_motion,
|
|
:setting_system_font_ui,
|
|
:setting_noindex,
|
|
:setting_hide_network,
|
|
:setting_hide_followers_count,
|
|
:setting_aggregate_reblogs,
|
|
:setting_show_application,
|
|
notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account),
|
|
interactions: %i(must_be_follower must_be_following)
|
|
)
|
|
end
|
|
end
|