From c5432e3a0976fe158b1eb2ed717b4dd94f6793ec Mon Sep 17 00:00:00 2001 From: David Roetzel Date: Wed, 3 Jun 2026 15:01:32 +0200 Subject: [PATCH] Remove `featuredObjectType` property (#39260) --- app/serializers/activitypub/featured_item_serializer.rb | 7 +------ .../activitypub/featured_collection_serializer_spec.rb | 2 -- .../activitypub/featured_item_serializer_spec.rb | 2 -- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/app/serializers/activitypub/featured_item_serializer.rb b/app/serializers/activitypub/featured_item_serializer.rb index 529bfd797f..4620c2d71a 100644 --- a/app/serializers/activitypub/featured_item_serializer.rb +++ b/app/serializers/activitypub/featured_item_serializer.rb @@ -3,8 +3,7 @@ class ActivityPub::FeaturedItemSerializer < ActivityPub::Serializer include RoutingHelper - attributes :id, :type, :featured_object, :featured_object_type, - :feature_authorization, :published + attributes :id, :type, :featured_object, :feature_authorization, :published def id ActivityPub::TagManager.instance.uri_for(object) @@ -18,10 +17,6 @@ class ActivityPub::FeaturedItemSerializer < ActivityPub::Serializer ActivityPub::TagManager.instance.uri_for(object.account) end - def featured_object_type - object.account.actor_type || 'Person' - end - def feature_authorization if object.account.local? ap_account_feature_authorization_url(object.account_id, object) diff --git a/spec/serializers/activitypub/featured_collection_serializer_spec.rb b/spec/serializers/activitypub/featured_collection_serializer_spec.rb index df582237ab..c68f826aa3 100644 --- a/spec/serializers/activitypub/featured_collection_serializer_spec.rb +++ b/spec/serializers/activitypub/featured_collection_serializer_spec.rb @@ -37,7 +37,6 @@ RSpec.describe ActivityPub::FeaturedCollectionSerializer do 'id' => ActivityPub::TagManager.instance.uri_for(collection_items.first), 'type' => 'FeaturedItem', 'featuredObject' => ActivityPub::TagManager.instance.uri_for(collection_items.first.account), - 'featuredObjectType' => 'Person', 'featureAuthorization' => ap_account_feature_authorization_url(collection_items.first.account_id, collection_items.first), 'published' => match_api_datetime_format, }, @@ -45,7 +44,6 @@ RSpec.describe ActivityPub::FeaturedCollectionSerializer do 'id' => ActivityPub::TagManager.instance.uri_for(collection_items.last), 'type' => 'FeaturedItem', 'featuredObject' => ActivityPub::TagManager.instance.uri_for(collection_items.last.account), - 'featuredObjectType' => 'Person', 'featureAuthorization' => ap_account_feature_authorization_url(collection_items.last.account_id, collection_items.last), 'published' => match_api_datetime_format, }, diff --git a/spec/serializers/activitypub/featured_item_serializer_spec.rb b/spec/serializers/activitypub/featured_item_serializer_spec.rb index 18afdd10fe..010f355f6d 100644 --- a/spec/serializers/activitypub/featured_item_serializer_spec.rb +++ b/spec/serializers/activitypub/featured_item_serializer_spec.rb @@ -15,7 +15,6 @@ RSpec.describe ActivityPub::FeaturedItemSerializer do 'type' => 'FeaturedItem', 'id' => ActivityPub::TagManager.instance.uri_for(collection_item), 'featuredObject' => ActivityPub::TagManager.instance.uri_for(collection_item.account), - 'featuredObjectType' => 'Person', 'featureAuthorization' => ap_account_feature_authorization_url(collection_item.account_id, collection_item), 'published' => '2026-04-16T01:00:00Z', }) @@ -32,7 +31,6 @@ RSpec.describe ActivityPub::FeaturedItemSerializer do 'type' => 'FeaturedItem', 'id' => ActivityPub::TagManager.instance.uri_for(collection_item), 'featuredObject' => ActivityPub::TagManager.instance.uri_for(collection_item.account), - 'featuredObjectType' => 'Person', 'featureAuthorization' => 'https://example.com/auth/1', }) end