mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-05 17:57:38 +00:00
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, we deleted it to not be flooded by Depandabot.
Kept deleted.
- `Gemfile.lock`:
Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
Upstream updated the serializer to support timed mutes, while
glitch-soc added a custom API ages ago to get information that
is already available elsewhere.
Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
🤷
- `app/models/user.rb`:
New user setting added upstream while we have glitch-soc-specific
user settings. Added upstream's user setting.
- `config/settings.yml`:
Upstream added a new user setting close to a user setting we had
changed the defaults for. Added the new upstream setting.
- `package.json`:
Upstream dependency updated “too close” to a glitch-soc-specific
dependency. No real conflict. Updated the dependency.
181 lines
6 KiB
Ruby
181 lines
6 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class UserSettingsDecorator
|
|
attr_reader :user, :settings
|
|
|
|
def initialize(user)
|
|
@user = user
|
|
end
|
|
|
|
def update(settings)
|
|
@settings = settings
|
|
process_update
|
|
end
|
|
|
|
private
|
|
|
|
def process_update
|
|
user.settings['notification_emails'] = merged_notification_emails if change?('notification_emails')
|
|
user.settings['interactions'] = merged_interactions if change?('interactions')
|
|
user.settings['default_privacy'] = default_privacy_preference if change?('setting_default_privacy')
|
|
user.settings['default_sensitive'] = default_sensitive_preference if change?('setting_default_sensitive')
|
|
user.settings['default_language'] = default_language_preference if change?('setting_default_language')
|
|
user.settings['unfollow_modal'] = unfollow_modal_preference if change?('setting_unfollow_modal')
|
|
user.settings['boost_modal'] = boost_modal_preference if change?('setting_boost_modal')
|
|
user.settings['favourite_modal'] = favourite_modal_preference if change?('setting_favourite_modal')
|
|
user.settings['delete_modal'] = delete_modal_preference if change?('setting_delete_modal')
|
|
user.settings['auto_play_gif'] = auto_play_gif_preference if change?('setting_auto_play_gif')
|
|
user.settings['display_media'] = display_media_preference if change?('setting_display_media')
|
|
user.settings['expand_spoilers'] = expand_spoilers_preference if change?('setting_expand_spoilers')
|
|
user.settings['reduce_motion'] = reduce_motion_preference if change?('setting_reduce_motion')
|
|
user.settings['disable_swiping'] = disable_swiping_preference if change?('setting_disable_swiping')
|
|
user.settings['system_font_ui'] = system_font_ui_preference if change?('setting_system_font_ui')
|
|
user.settings['system_emoji_font'] = system_emoji_font_preference if change?('setting_system_emoji_font')
|
|
user.settings['noindex'] = noindex_preference if change?('setting_noindex')
|
|
user.settings['hide_followers_count']= hide_followers_count_preference if change?('setting_hide_followers_count')
|
|
user.settings['flavour'] = flavour_preference if change?('setting_flavour')
|
|
user.settings['skin'] = skin_preference if change?('setting_skin')
|
|
user.settings['hide_network'] = hide_network_preference if change?('setting_hide_network')
|
|
user.settings['aggregate_reblogs'] = aggregate_reblogs_preference if change?('setting_aggregate_reblogs')
|
|
user.settings['show_application'] = show_application_preference if change?('setting_show_application')
|
|
user.settings['advanced_layout'] = advanced_layout_preference if change?('setting_advanced_layout')
|
|
user.settings['default_content_type']= default_content_type_preference if change?('setting_default_content_type')
|
|
user.settings['use_blurhash'] = use_blurhash_preference if change?('setting_use_blurhash')
|
|
user.settings['use_pending_items'] = use_pending_items_preference if change?('setting_use_pending_items')
|
|
user.settings['trends'] = trends_preference if change?('setting_trends')
|
|
user.settings['crop_images'] = crop_images_preference if change?('setting_crop_images')
|
|
end
|
|
|
|
def merged_notification_emails
|
|
user.settings['notification_emails'].merge coerced_settings('notification_emails').to_h
|
|
end
|
|
|
|
def merged_interactions
|
|
user.settings['interactions'].merge coerced_settings('interactions').to_h
|
|
end
|
|
|
|
def default_privacy_preference
|
|
settings['setting_default_privacy']
|
|
end
|
|
|
|
def default_sensitive_preference
|
|
boolean_cast_setting 'setting_default_sensitive'
|
|
end
|
|
|
|
def unfollow_modal_preference
|
|
boolean_cast_setting 'setting_unfollow_modal'
|
|
end
|
|
|
|
def boost_modal_preference
|
|
boolean_cast_setting 'setting_boost_modal'
|
|
end
|
|
|
|
def favourite_modal_preference
|
|
boolean_cast_setting 'setting_favourite_modal'
|
|
end
|
|
|
|
def delete_modal_preference
|
|
boolean_cast_setting 'setting_delete_modal'
|
|
end
|
|
|
|
def system_font_ui_preference
|
|
boolean_cast_setting 'setting_system_font_ui'
|
|
end
|
|
|
|
def system_emoji_font_preference
|
|
boolean_cast_setting 'setting_system_emoji_font'
|
|
end
|
|
|
|
def auto_play_gif_preference
|
|
boolean_cast_setting 'setting_auto_play_gif'
|
|
end
|
|
|
|
def display_media_preference
|
|
settings['setting_display_media']
|
|
end
|
|
|
|
def expand_spoilers_preference
|
|
boolean_cast_setting 'setting_expand_spoilers'
|
|
end
|
|
|
|
def reduce_motion_preference
|
|
boolean_cast_setting 'setting_reduce_motion'
|
|
end
|
|
|
|
def disable_swiping_preference
|
|
boolean_cast_setting 'setting_disable_swiping'
|
|
end
|
|
|
|
def noindex_preference
|
|
boolean_cast_setting 'setting_noindex'
|
|
end
|
|
|
|
def hide_followers_count_preference
|
|
boolean_cast_setting 'setting_hide_followers_count'
|
|
end
|
|
|
|
def flavour_preference
|
|
settings['setting_flavour']
|
|
end
|
|
|
|
def skin_preference
|
|
settings['setting_skin']
|
|
end
|
|
|
|
def hide_network_preference
|
|
boolean_cast_setting 'setting_hide_network'
|
|
end
|
|
|
|
def show_application_preference
|
|
boolean_cast_setting 'setting_show_application'
|
|
end
|
|
|
|
def default_language_preference
|
|
settings['setting_default_language']
|
|
end
|
|
|
|
def aggregate_reblogs_preference
|
|
boolean_cast_setting 'setting_aggregate_reblogs'
|
|
end
|
|
|
|
def advanced_layout_preference
|
|
boolean_cast_setting 'setting_advanced_layout'
|
|
end
|
|
|
|
def default_content_type_preference
|
|
settings['setting_default_content_type']
|
|
end
|
|
|
|
def use_blurhash_preference
|
|
boolean_cast_setting 'setting_use_blurhash'
|
|
end
|
|
|
|
def use_pending_items_preference
|
|
boolean_cast_setting 'setting_use_pending_items'
|
|
end
|
|
|
|
def trends_preference
|
|
boolean_cast_setting 'setting_trends'
|
|
end
|
|
|
|
def crop_images_preference
|
|
boolean_cast_setting 'setting_crop_images'
|
|
end
|
|
|
|
def boolean_cast_setting(key)
|
|
ActiveModel::Type::Boolean.new.cast(settings[key])
|
|
end
|
|
|
|
def coerced_settings(key)
|
|
coerce_values settings.fetch(key, {})
|
|
end
|
|
|
|
def coerce_values(params_hash)
|
|
params_hash.transform_values { |x| ActiveModel::Type::Boolean.new.cast(x) }
|
|
end
|
|
|
|
def change?(key)
|
|
!settings[key].nil?
|
|
end
|
|
end
|