about summary refs log tree commit diff
path: root/app/serializers
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2019-05-10 05:55:03 -0500
committermultiple creatures <dev@multiple-creature.party>2019-05-21 03:16:23 -0500
commit47a251048c7b236a667195591a0db02b9e0f6745 (patch)
treefdaf8aa8de65a3b92d1bf3eb589b26e44a7f5dda /app/serializers
parent8d122422167784883a87a0461d098d885dd3599d (diff)
Expose user settings to `Account` model and update code referencing those settings.
Diffstat (limited to 'app/serializers')
-rw-r--r--app/serializers/initial_state_serializer.rb8
1 files changed, 4 insertions, 4 deletions
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