add account limited by admin flag to api + badge

2 files changed, 8 insertions, 23 deletions

diff --git a/app/serializers/activitypub/actor_serializer.rb b/app/serializers/activitypub/actor_serializer.rb
index 4cafe27e9..7ea28afd5 100644
--- a/app/serializers/activitypub/actor_serializer.rb
+++ b/app/serializers/activitypub/actor_serializer.rb
@@ -6,7 +6,7 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
   context :security
 
   context_extensions :manually_approves_followers, :featured, :also_known_as,
-                     :moved_to, :property_value, :hashtag, :emoji, :identity_proof,
+                     :moved_to, :property_value, :hashtag, :emoji,
                      :adult_content, :gently, :kobold, :froze, :big
 
   attributes :id, :type, :following, :followers,
@@ -122,7 +122,7 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
   end
 
   def virtual_attachments
-    object.fields + object.identity_proofs.active
+    object.fields
   end
 
   def moved_to
@@ -169,24 +169,4 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
       Formatter.instance.format_field(object.account, object.value)
     end
   end
-
-  class AccountIdentityProofSerializer < ActivityPub::Serializer
-    attributes :type, :name, :signature_algorithm, :signature_value
-
-    def type
-      'IdentityProof'
-    end
-
-    def name
-      object.provider_username
-    end
-
-    def signature_algorithm
-      object.provider
-    end
-
-    def signature_value
-      object.token
-    end
-  end
 end
diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb
index afd6a9e4e..509b688db 100644
--- a/app/serializers/rest/account_serializer.rb
+++ b/app/serializers/rest/account_serializer.rb
@@ -6,7 +6,8 @@ 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, :gently, :kobold, :role, :froze, :identity, :signature
+             :adult_content, :gently, :kobold, :role, :froze, :identity,
+             :limited, :signature
 
   has_one :moved_to_account, key: :moved, serializer: REST::AccountSerializer, if: :moved_and_not_nested?
   has_many :emojis, serializer: REST::CustomEmojiSerializer
@@ -67,6 +68,10 @@ class REST::AccountSerializer < ActiveModel::Serializer
     object.local? ? (object&.user.nil? ? true : object.user.disabled?) : object.froze?
   end
 
+  def limited
+    object.silenced? || object.force_unlisted? || object.force_sensitive?
+  end
+
   def identity
     return unless object.local? && object&.user.present?
     object.user.vars['_they:are']