diff options
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/initial_state_serializer.rb | 2 | ||||
| -rw-r--r-- | app/serializers/rest/account_serializer.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb index e22ebfd4d..5501ea040 100644 --- a/app/serializers/initial_state_serializer.rb +++ b/app/serializers/initial_state_serializer.rb @@ -49,7 +49,7 @@ class InitialStateSerializer < ActiveModel::Serializer store[:expand_spoilers] = object.current_account.user.setting_expand_spoilers store[:reduce_motion] = object.current_account.user.setting_reduce_motion store[:advanced_layout] = object.current_account.user.setting_advanced_layout - store[:is_staff] = object.current_account.user.staff? + store[:is_staff] = object.current_account.user.staff? && !object.current_account.user.defanged? store[:default_content_type] = object.current_account.user.setting_default_content_type end diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb index 43b05964e..28b9fde44 100644 --- a/app/serializers/rest/account_serializer.rb +++ b/app/serializers/rest/account_serializer.rb @@ -69,6 +69,7 @@ class REST::AccountSerializer < ActiveModel::Serializer def role return 'admin' if object.user_admin? return 'moderator' if object.user_moderator? + return 'halfmod' if object.user_halfmod? 'user' end |