From f1d3215d4b7fd6992a827967e866c80b5e853d81 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 10 Jul 2025 22:56:33 +0200 Subject: [PATCH] Add support for `preview` (FEP-b2b8) on unsupported ActivityPub objects --- app/lib/activitypub/activity.rb | 6 ++- app/lib/activitypub/activity/create.rb | 48 +++++++++++-------- app/lib/activitypub/preview_builder.rb | 27 +++++++++++ spec/lib/activitypub/activity/create_spec.rb | 49 ++++++++++++++++++++ 4 files changed, 109 insertions(+), 21 deletions(-) create mode 100644 app/lib/activitypub/preview_builder.rb diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb index 93b45e80188..ff1eb483876 100644 --- a/app/lib/activitypub/activity.rb +++ b/app/lib/activitypub/activity.rb @@ -78,7 +78,7 @@ class ActivityPub::Activity end def unsupported_object_type? - @object.is_a?(String) || !(supported_object_type? || converted_object_type?) + @object.is_a?(String) || !(supported_object_type? || converted_object_type? || supported_preview?) end def supported_object_type? @@ -89,6 +89,10 @@ class ActivityPub::Activity equals_or_includes_any?(@object['type'], CONVERTED_TYPES) end + def supported_preview? + @object['preview'].is_a?(Hash) && equals_or_includes_any?(@object['preview']['type'], SUPPORTED_TYPES) + end + def delete_arrived_first?(uri) redis.exists?("delete_upon_arrival:#{@account.id}:#{uri}") end diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index f7c723757ef..a1f9569e191 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true class ActivityPub::Activity::Create < ActivityPub::Activity - include FormattingHelper - def perform @account.schedule_refresh_if_stale! @@ -90,15 +88,15 @@ class ActivityPub::Activity::Create < ActivityPub::Activity object: @object ) - attachment_ids = process_attachments.take(Status::MEDIA_ATTACHMENTS_LIMIT).map(&:id) + attachment_ids = process_attachments(!supported_object_type? && supported_preview? ? @object['preview'] : @object).take(Status::MEDIA_ATTACHMENTS_LIMIT).map(&:id) @params = { uri: @status_parser.uri, url: @status_parser.url || @status_parser.uri, account: @account, - text: converted_object_type? ? converted_text : (@status_parser.text || ''), + text: @status_parser.text || '', language: @status_parser.language, - spoiler_text: converted_object_type? ? '' : (@status_parser.spoiler_text || ''), + spoiler_text: @status_parser.spoiler_text || '', created_at: @status_parser.created_at, edited_at: @status_parser.edited_at && @status_parser.edited_at != @status_parser.created_at ? @status_parser.edited_at : nil, override_timestamps: @options[:override_timestamps], @@ -112,6 +110,28 @@ class ActivityPub::Activity::Create < ActivityPub::Activity poll: process_poll, quote_approval_policy: @status_parser.quote_policy, } + + # If it's a Note or Question, we're done + return if supported_object_type? + + # If it's an unsupported type, rely on the preview from FEP-b2b8 if available + if supported_preview? + preview_parser = ActivityPub::Parser::StatusParser.new( + @json, + followers_collection: @account.followers_url, + actor_uri: ActivityPub::TagManager.instance.uri_for(@account), + object: @object['preview'] + ) + + @params[:text] = preview_parser.text || '' + @params[:spoiler_text] = preview_parser.spoiler_text || '' + + return + end + + # If there is no preview, fall back to building our own preview + @params[:text] = ActivityPub::PreviewBuilder.new(@status_parser).text + @params[:spoiler_text] = '' end def process_audience @@ -277,12 +297,12 @@ class ActivityPub::Activity::Create < ActivityPub::Activity end end - def process_attachments - return [] if @object['attachment'].nil? + def process_attachments(parent) + return [] if parent['attachment'].nil? media_attachments = [] - as_array(@object['attachment']).each do |attachment| + as_array(parent['attachment']).each do |attachment| media_attachment_parser = ActivityPub::Parser::MediaAttachmentParser.new(attachment) next if media_attachment_parser.remote_url.blank? || media_attachments.size >= Status::MEDIA_ATTACHMENTS_LIMIT @@ -405,18 +425,6 @@ class ActivityPub::Activity::Create < ActivityPub::Activity value_or_id(@object['inReplyTo']) end - def converted_text - [formatted_title, @status_parser.spoiler_text.presence, formatted_url].compact.join("\n\n") - end - - def formatted_title - "

#{@status_parser.title}

" if @status_parser.title.present? - end - - def formatted_url - linkify(@status_parser.url || @status_parser.uri) - end - def unsupported_media_type?(mime_type) mime_type.present? && !MediaAttachment.supported_mime_types.include?(mime_type) end diff --git a/app/lib/activitypub/preview_builder.rb b/app/lib/activitypub/preview_builder.rb new file mode 100644 index 00000000000..edc76fe7a29 --- /dev/null +++ b/app/lib/activitypub/preview_builder.rb @@ -0,0 +1,27 @@ +# frozen_string_literal: true + +class ActivityPub::PreviewBuilder + include FormattingHelper + + def initialize(parser) + @parser = parser + end + + def text + [title, summary, url].compact.join("\n\n") + end + + private + + def title + "

#{@parser.title}

" if @parser.title.present? + end + + def summary + @parser.spoiler_text + end + + def url + linkify(@parser.url || @parser.uri) + end +end diff --git a/spec/lib/activitypub/activity/create_spec.rb b/spec/lib/activitypub/activity/create_spec.rb index 74c9f107187..297224a9ab0 100644 --- a/spec/lib/activitypub/activity/create_spec.rb +++ b/spec/lib/activitypub/activity/create_spec.rb @@ -887,6 +887,55 @@ RSpec.describe ActivityPub::Activity::Create do end end + context 'with preview of an unsupported type' do + let(:object_json) do + build_object( + type: 'Article', + summary: 'This is the summary of the article', + content: 'This is the long form content', + preview: { + type: 'Note', + content: 'This is the short form', + } + ) + end + + it 'creates status from the preview' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + + status = sender.statuses.first + expect(status).to_not be_nil + expect(status.spoiler_text).to eq '' + expect(status.text).to eq 'This is the short form' + end + end + + context 'with a converted type and no preview' do + let(:object_json) do + build_object( + type: 'Video', + name: 'Foo bar', + content: 'This is the description of the video', + url: [ + { + type: 'Link', + mediaType: 'text/html', + href: 'https://example.com/video', + }, + ] + ) + end + + it 'creates status' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + + status = sender.statuses.first + expect(status).to_not be_nil + expect(status.spoiler_text).to eq '' + expect(status.text).to eq "

Foo bar

\n\n

https://example.com/video

" + end + end + context 'with an unverifiable quote of a known post' do let(:quoted_status) { Fabricate(:status) }