tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove featuredObjectType property (#39260)

Browse Source
This commit is contained in:
David Roetzel 2026-06-03 15:01:32 +02:00 committed by GitHub
parent 0529a1f7d2
commit c5432e3a09
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/serializers/activitypub/featured_item_serializer.rb
View File

@ -3,8 +3,7 @@
class ActivityPub::FeaturedItemSerializer < ActivityPub::Serializer class ActivityPub::FeaturedItemSerializer < ActivityPub::Serializer
include RoutingHelper include RoutingHelper
attributes :id, :type, :featured_object, :featured_object_type, attributes :id, :type, :featured_object, :feature_authorization, :published
:feature_authorization, :published
def id def id
ActivityPub::TagManager.instance.uri_for(object) ActivityPub::TagManager.instance.uri_for(object)
@ -18,10 +17,6 @@ class ActivityPub::FeaturedItemSerializer < ActivityPub::Serializer
ActivityPub::TagManager.instance.uri_for(object.account) ActivityPub::TagManager.instance.uri_for(object.account)
end end
def featured_object_type
object.account.actor_type || 'Person'
end
def feature_authorization def feature_authorization
if object.account.local? if object.account.local?
ap_account_feature_authorization_url(object.account_id, object) ap_account_feature_authorization_url(object.account_id, object)

2
spec/serializers/activitypub/featured_collection_serializer_spec.rb
View File

@ -37,7 +37,6 @@ RSpec.describe ActivityPub::FeaturedCollectionSerializer do
'id' => ActivityPub::TagManager.instance.uri_for(collection_items.first), 'id' => ActivityPub::TagManager.instance.uri_for(collection_items.first),
'type' => 'FeaturedItem', 'type' => 'FeaturedItem',
'featuredObject' => ActivityPub::TagManager.instance.uri_for(collection_items.first.account), '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), 'featureAuthorization' => ap_account_feature_authorization_url(collection_items.first.account_id, collection_items.first),
'published' => match_api_datetime_format, 'published' => match_api_datetime_format,
}, },
@ -45,7 +44,6 @@ RSpec.describe ActivityPub::FeaturedCollectionSerializer do
'id' => ActivityPub::TagManager.instance.uri_for(collection_items.last), 'id' => ActivityPub::TagManager.instance.uri_for(collection_items.last),
'type' => 'FeaturedItem', 'type' => 'FeaturedItem',
'featuredObject' => ActivityPub::TagManager.instance.uri_for(collection_items.last.account), '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), 'featureAuthorization' => ap_account_feature_authorization_url(collection_items.last.account_id, collection_items.last),
'published' => match_api_datetime_format, 'published' => match_api_datetime_format,
}, },

2
spec/serializers/activitypub/featured_item_serializer_spec.rb
View File

@ -15,7 +15,6 @@ RSpec.describe ActivityPub::FeaturedItemSerializer do
'type' => 'FeaturedItem', 'type' => 'FeaturedItem',
'id' => ActivityPub::TagManager.instance.uri_for(collection_item), 'id' => ActivityPub::TagManager.instance.uri_for(collection_item),
'featuredObject' => ActivityPub::TagManager.instance.uri_for(collection_item.account), 'featuredObject' => ActivityPub::TagManager.instance.uri_for(collection_item.account),
'featuredObjectType' => 'Person',
'featureAuthorization' => ap_account_feature_authorization_url(collection_item.account_id, collection_item), 'featureAuthorization' => ap_account_feature_authorization_url(collection_item.account_id, collection_item),
'published' => '2026-04-16T01:00:00Z', 'published' => '2026-04-16T01:00:00Z',
}) })
@ -32,7 +31,6 @@ RSpec.describe ActivityPub::FeaturedItemSerializer do
'type' => 'FeaturedItem', 'type' => 'FeaturedItem',
'id' => ActivityPub::TagManager.instance.uri_for(collection_item), 'id' => ActivityPub::TagManager.instance.uri_for(collection_item),
'featuredObject' => ActivityPub::TagManager.instance.uri_for(collection_item.account), 'featuredObject' => ActivityPub::TagManager.instance.uri_for(collection_item.account),
'featuredObjectType' => 'Person',
'featureAuthorization' => 'https://example.com/auth/1', 'featureAuthorization' => 'https://example.com/auth/1',
}) })
end end