1fbd1fa5c4
Conflicts: - `app/controllers/settings/preferences_controller.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/lib/user_settings_decorator.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/models/status.rb`: Conflict because of slight change in how glitch-soc handles the scope to filter out local-only posts for anonymous viewers. Took upstream's changes and re-applied glitch-soc's change. - `app/models/user.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/views/directories/index.html.haml`: Conflict because upstream redesigned that page while glitch-soc had a minor change to support hiding the number of followers. Ported glitch-soc's change on top of upstream's redesign. Additional changes: - `app/models/account_statuses_filter.rb`: See change to `app/models/status.rb`.
64 lines
1.7 KiB
Ruby
64 lines
1.7 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 after_update_redirect_path, notice: I18n.t('generic.changes_saved_msg')
|
|
else
|
|
render :show
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def after_update_redirect_path
|
|
settings_preferences_path
|
|
end
|
|
|
|
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_disable_swiping,
|
|
:setting_system_font_ui,
|
|
:setting_system_emoji_font,
|
|
:setting_noindex,
|
|
:setting_hide_followers_count,
|
|
:setting_aggregate_reblogs,
|
|
:setting_show_application,
|
|
:setting_advanced_layout,
|
|
:setting_default_content_type,
|
|
:setting_use_blurhash,
|
|
:setting_use_pending_items,
|
|
:setting_trends,
|
|
:setting_crop_images,
|
|
notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account trending_tag trending_link trending_status),
|
|
interactions: %i(must_be_follower must_be_following must_be_following_dm)
|
|
)
|
|
end
|
|
end
|