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

Fix not updating a status when newer version is fetched manually (#17745)

Browse Source
This commit is contained in:
Eugen Rochko
2022-03-12 09:11:36 +01:00
committed by GitHub
parent 883099f3c9
commit ddbe906c25
6 changed files with 72 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/services/activitypub/fetch_remote_status_service.rb
View File

@@ -15,24 +15,30 @@ class ActivityPub::FetchRemoteStatusService < BaseService
return unless supported_context?
actor_id = nil
actor_uri = nil
activity_json = nil
object_uri = nil
if expected_object_type?
actor_id = value_or_id(first_of_value(@json['attributedTo']))
activity_json = { 'type' => 'Create', 'actor' => actor_id, 'object' => @json }
actor_uri = value_or_id(first_of_value(@json['attributedTo']))
activity_json = { 'type' => 'Create', 'actor' => actor_uri, 'object' => @json }
object_uri = uri_from_bearcap(@json['id'])
elsif expected_activity_type?
actor_id = value_or_id(first_of_value(@json['actor']))
actor_uri = value_or_id(first_of_value(@json['actor']))
activity_json = @json
object_uri = uri_from_bearcap(value_or_id(@json['object']))
end
return if activity_json.nil? || !trustworthy_attribution?(@json['id'], actor_id)
return if activity_json.nil? || object_uri.nil? || !trustworthy_attribution?(@json['id'], actor_uri)
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)
actor = account_from_uri(actor_uri)
return if actor.nil? || actor.suspended?
# If we fetched a status that already exists, then we need to treat the
# activity as an update rather than create
activity_json['type'] = 'Update' if equals_or_includes_any?(activity_json['type'], %w(Create)) && Status.where(uri: object_uri, account_id: actor.id).exists?
ActivityPub::Activity.factory(activity_json, actor).perform
end
@@ -43,6 +49,12 @@ class ActivityPub::FetchRemoteStatusService < BaseService
Addressable::URI.parse(uri).normalized_host.casecmp(Addressable::URI.parse(attributed_to).normalized_host).zero?
end
def account_from_uri(uri)
actor = ActivityPub::TagManager.instance.uri_to_resource(uri, Account)
actor = ActivityPub::FetchRemoteAccountService.new.call(uri, id: true) if actor.nil? || actor.possibly_stale?
actor
end
def supported_context?
super(@json)
end
@@ -54,8 +66,4 @@ class ActivityPub::FetchRemoteStatusService < BaseService
def expected_object_type?
equals_or_includes_any?(@json['type'], ActivityPub::Activity::Create::SUPPORTED_TYPES + ActivityPub::Activity::Create::CONVERTED_TYPES)
end
def needs_update?(actor)
actor.possibly_stale?
end
end