Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add support for fetching Create and Announce activities by URI (#16383)

Browse source 
* Add support for fetching Create and Announce activities by URI

This should improve compatibility with ZAP and offer a way to fetch boosts,
which is currently not possible.

* Add tests
This commit is contained in:
Claire 2021-10-21 01:14:04 +02:00 • committed by GitHub
parent 70931fd687
commit 3f9b28ce26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 60 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

29
app/services/activitypub/fetch_remote_status_service.rb
View file

@ -13,7 +13,20 @@ class ActivityPub::FetchRemoteStatusService < BaseService
end
end
return if !(supported_context? && expected_type?) || actor_id.nil? || !trustworthy_attribution?(@json['id'], actor_id)
return unless supported_context?
actor_id = nil
activity_json = nil
if expected_object_type?
actor_id = value_or_id(first_of_value(@json['attributedTo']))
activity_json = { 'type' => 'Create', 'actor' => actor_id, 'object' => @json }
elsif expected_activity_type?
actor_id = value_or_id(first_of_value(@json['actor']))
activity_json = @json
end
return if activity_json.nil? || !trustworthy_attribution?(@json['id'], actor_id)
actor = ActivityPub::TagManager.instance.uri_to_resource(actor_id, Account)
actor = ActivityPub::FetchRemoteAccountService.new.call(actor_id, id: true) if actor.nil? || needs_update?(actor)
@ -25,14 +38,6 @@ class ActivityPub::FetchRemoteStatusService < BaseService
private
def activity_json
{ 'type' => 'Create', 'actor' => actor_id, 'object' => @json }
end
def actor_id
value_or_id(first_of_value(@json['attributedTo']))
end
def trustworthy_attribution?(uri, attributed_to)
return false if uri.nil? || attributed_to.nil?
Addressable::URI.parse(uri).normalized_host.casecmp(Addressable::URI.parse(attributed_to).normalized_host).zero?
@ -42,7 +47,11 @@ class ActivityPub::FetchRemoteStatusService < BaseService
super(@json)
end
def expected_type?
def expected_activity_type?
equals_or_includes_any?(@json['type'], %w(Create Announce))
end
def expected_object_type?
equals_or_includes_any?(@json['type'], ActivityPub::Activity::Create::SUPPORTED_TYPES + ActivityPub::Activity::Create::CONVERTED_TYPES)
end