Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 03:00:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fetch unknown collection when handling FeatureRequest activity (#38413)

Browse Source
This commit is contained in:
David Roetzel
2026-03-26 14:30:27 +01:00
committed by GitHub
parent 35c30dfc6e
commit abd29109c5
2 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/lib/activitypub/activity/feature_request.rb
View File

@@ -7,7 +7,7 @@ class ActivityPub::Activity::FeatureRequest < ActivityPub::Activity
return unless Mastodon::Feature.collections_federation_enabled?
return if non_matching_uri_hosts?(@account.uri, @json['id'])
@collection = @account.collections.find_by(uri: value_or_id(@json['instrument']))
@collection = find_or_fetch_collection
@featured_account = ActivityPub::TagManager.instance.uris_to_local_accounts([value_or_id(@json['object'])]).first
return if @collection.nil? || @featured_account.nil?
@@ -37,6 +37,17 @@ class ActivityPub::Activity::FeatureRequest < ActivityPub::Activity
queue_delivery!(collection_item, ActivityPub::RejectFeatureRequestSerializer)
end
def find_or_fetch_collection
uri = value_or_id(@json['instrument'])
collection = @account.collections.find_by(uri:)
return collection if collection.present?
collection = ActivityPub::FetchRemoteFeaturedCollectionService.new.call(uri)
return collection if collection.present? && collection.account == @account
nil
end
def collection_item_attributes(state = :accepted)
{ account: @featured_account, activity_uri: @json['id'], state: }
end