From 47a251048c7b236a667195591a0db02b9e0f6745 Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Fri, 10 May 2019 05:55:03 -0500 Subject: Expose user settings to `Account` model and update code referencing those settings. --- app/serializers/initial_state_serializer.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'app/serializers') diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb index 4622ddb9e..7afeffe25 100644 --- a/app/serializers/initial_state_serializer.rb +++ b/app/serializers/initial_state_serializer.rb @@ -38,8 +38,8 @@ class InitialStateSerializer < ActiveModel::Serializer if object.current_account store[:me] = object.current_account.id.to_s - store[:default_local] = object.current_account.user.setting_default_local - store[:always_local] = object.current_account.user.setting_always_local + store[:default_local] = object.current_account.user_defaults_to_local_only? + store[:always_local] = object.current_account.user_always_local_only? store[:unfollow_modal] = object.current_account.user.setting_unfollow_modal store[:boost_modal] = object.current_account.user.setting_boost_modal store[:favourite_modal] = object.current_account.user.setting_favourite_modal @@ -60,8 +60,8 @@ class InitialStateSerializer < ActiveModel::Serializer if object.current_account store[:me] = object.current_account.id.to_s - store[:default_privacy] = object.current_account.user.setting_default_privacy - store[:default_sensitive] = object.current_account.user.setting_default_sensitive + store[:default_privacy] = object.current_account.user_default_visibility + store[:default_sensitive] = object.current_account.user_defaults_to_sensitive? end store[:text] = object.text if object.text -- cgit