diff options
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/activitypub/fetch_remote_status_service.rb | 30 | ||||
| -rw-r--r-- | app/services/activitypub/process_status_update_service.rb | 23 |
2 files changed, 38 insertions, 15 deletions
diff --git a/app/services/activitypub/fetch_remote_status_service.rb b/app/services/activitypub/fetch_remote_status_service.rb index 4f789d50b..9672b3d2b 100644 --- a/app/services/activitypub/fetch_remote_status_service.rb +++ b/app/services/activitypub/fetch_remote_status_service.rb @@ -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 diff --git a/app/services/activitypub/process_status_update_service.rb b/app/services/activitypub/process_status_update_service.rb index 1260c0482..47a788c30 100644 --- a/app/services/activitypub/process_status_update_service.rb +++ b/app/services/activitypub/process_status_update_service.rb @@ -13,7 +13,9 @@ class ActivityPub::ProcessStatusUpdateService < BaseService @poll_changed = false # Only native types can be updated at the moment - return if !expected_type? || already_updated_more_recently? + return @status if !expected_type? || already_updated_more_recently? + + last_edit_date = status.edited_at.presence || status.created_at # Only allow processing one create/update per status at a time RedisLock.acquire(lock_options) do |lock| @@ -37,13 +39,18 @@ class ActivityPub::ProcessStatusUpdateService < BaseService raise Mastodon::RaceConditionError end end + + forward_activity! if significant_changes? && @status_parser.edited_at.present? && @status_parser.edited_at > last_edit_date + + @status end private def update_media_attachments! - previous_media_attachments = @status.media_attachments.to_a - next_media_attachments = [] + previous_media_attachments = @status.media_attachments.to_a + previous_media_attachments_ids = @status.ordered_media_attachment_ids || previous_media_attachments.map(&:id) + next_media_attachments = [] as_array(@json['attachment']).each do |attachment| media_attachment_parser = ActivityPub::Parser::MediaAttachmentParser.new(attachment) @@ -83,7 +90,7 @@ class ActivityPub::ProcessStatusUpdateService < BaseService @status.ordered_media_attachment_ids = next_media_attachments.map(&:id) @status.media_attachments.reload - @media_attachments_changed = true if @status.ordered_media_attachment_ids_changed? + @media_attachments_changed = true if @status.ordered_media_attachment_ids != previous_media_attachments_ids end def update_poll! @@ -263,4 +270,12 @@ class ActivityPub::ProcessStatusUpdateService < BaseService PollExpirationNotifyWorker.remove_from_scheduled(poll.id) if @previous_expires_at.present? && @previous_expires_at > poll.expires_at PollExpirationNotifyWorker.perform_at(poll.expires_at + 5.minutes, poll.id) end + + def forward_activity! + forwarder.forward! if forwarder.forwardable? + end + + def forwarder + @forwarder ||= ActivityPub::Forwarder.new(@account, @json, @status) + end end |