From 6d07ba50f31f82633019b62dc83ec7099e3926b3 Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Fri, 19 Jul 2019 15:43:59 -0500 Subject: keep `locked` badge for approves-followers + add `frozen` badge for admin-locked accts, also federate `frozen` state --- app/serializers/rest/account_serializer.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'app/serializers/rest') diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb index 852ecdae1..bd98989e2 100644 --- a/app/serializers/rest/account_serializer.rb +++ b/app/serializers/rest/account_serializer.rb @@ -6,7 +6,7 @@ class REST::AccountSerializer < ActiveModel::Serializer attributes :id, :username, :acct, :display_name, :locked, :bot, :created_at, :note, :url, :avatar, :avatar_static, :header, :header_static, :followers_count, :following_count, :statuses_count, :replies, - :adult_content, :supports_chat, :gently, :kobold, :role + :adult_content, :supports_chat, :gently, :kobold, :role, :froze has_one :moved_to_account, key: :moved, serializer: REST::AccountSerializer, if: :moved_and_not_nested? has_many :emojis, serializer: REST::CustomEmojiSerializer @@ -62,4 +62,8 @@ class REST::AccountSerializer < ActiveModel::Serializer return 'moderator' if object.user_moderator? 'user' end + + def froze + object.local? ? (object&.user.nil? ? true : object.user.disabled?) : object.froze? + end end -- cgit