Merge f1d3215d4b into 3b52dca405

app/helpers/context_helper.rb

@@ -26,6 +26,12 @@ module ContextHelper
     suspended: { 'toot' => 'http://joinmastodon.org/ns#', 'suspended' => 'toot:suspended' },
     attribution_domains: { 'toot' => 'http://joinmastodon.org/ns#', 'attributionDomains' => { '@id' => 'toot:attributionDomains', '@type' => '@id' } },
     quote_requests: { 'QuoteRequest' => 'https://w3id.org/fep/044f#QuoteRequest' },
+    quotes: {
+      'quote' => 'https://w3id.org/fep/044f#quote',
+      'quoteUri' => 'http://fedibird.com/ns#quoteUri',
+      '_misskey_quote' => 'https://misskey-hub.net/ns#_misskey_quote',
+      'quoteAuthorization' => 'https://w3id.org/fep/044f#quoteAuthorization',
+    },
     interaction_policies: {
       'gts' => 'https://gotosocial.org/ns#',
       'interactionPolicy' => { '@id' => 'gts:interactionPolicy', '@type' => '@id' },

app/javascript/mastodon/components/account_bio.tsx

@@ -1,12 +1,30 @@
+import { useCallback } from 'react';
+
 import { useLinks } from 'mastodon/hooks/useLinks';
 
-export const AccountBio: React.FC<{
+interface AccountBioProps {
   note: string;
   className: string;
-}> = ({ note, className }) => {
-  const handleClick = useLinks();
+  dropdownAccountId?: string;
+}
 
-  if (note.length === 0 || note === '<p></p>') {
+export const AccountBio: React.FC<AccountBioProps> = ({
+  note,
+  className,
+  dropdownAccountId,
+}) => {
+  const handleClick = useLinks(!!dropdownAccountId);
+  const handleNodeChange = useCallback(
+    (node: HTMLDivElement | null) => {
+      if (!dropdownAccountId || !node || node.childNodes.length === 0) {
+        return;
+      }
+      addDropdownToHashtags(node, dropdownAccountId);
+    },
+    [dropdownAccountId],
+  );
+
+  if (note.length === 0) {
     return null;
   }
 
@@ -15,6 +33,28 @@ export const AccountBio: React.FC<{
       className={`${className} translate`}
       dangerouslySetInnerHTML={{ __html: note }}
       onClickCapture={handleClick}
+      ref={handleNodeChange}
     />
   );
 };
+
+function addDropdownToHashtags(node: HTMLElement | null, accountId: string) {
+  if (!node) {
+    return;
+  }
+  for (const childNode of node.childNodes) {
+    if (!(childNode instanceof HTMLElement)) {
+      continue;
+    }
+    if (
+      childNode instanceof HTMLAnchorElement &&
+      (childNode.classList.contains('hashtag') ||
+        childNode.innerText.startsWith('#')) &&
+      !childNode.dataset.menuHashtag
+    ) {
+      childNode.dataset.menuHashtag = accountId;
+    } else if (childNode.childNodes.length > 0) {
+      addDropdownToHashtags(childNode, accountId);
+    }
+  }
+}

app/javascript/mastodon/features/account_timeline/components/account_header.tsx

@@ -6,6 +6,7 @@ import classNames from 'classnames';
 import { Helmet } from 'react-helmet';
 import { NavLink } from 'react-router-dom';
 
+import { AccountBio } from '@/mastodon/components/account_bio';
 import CheckIcon from '@/material-icons/400-24px/check.svg?react';
 import LockIcon from '@/material-icons/400-24px/lock.svg?react';
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
@@ -773,7 +774,6 @@ export const AccountHeader: React.FC<{
     );
   }
 
-  const content = { __html: account.note_emojified };
   const displayNameHtml = { __html: account.display_name_html };
   const fields = account.fields;
   const isLocal = !account.acct.includes('@');
@@ -897,12 +897,11 @@ export const AccountHeader: React.FC<{
                   <AccountNote accountId={accountId} />
                 )}
 
-                {account.note.length > 0 && account.note !== '<p></p>' && (
-                  <div
-                    className='account__header__content translate'
-                    dangerouslySetInnerHTML={content}
-                  />
-                )}
+                <AccountBio
+                  note={account.note_emojified}
+                  dropdownAccountId={accountId}
+                  className='account__header__content'
+                />
 
                 <div className='account__header__fields'>
                   <dl>

app/javascript/mastodon/hooks/useLinks.ts

@@ -8,13 +8,14 @@ import { openURL } from 'mastodon/actions/search';
 import { useAppDispatch } from 'mastodon/store';
 
 const isMentionClick = (element: HTMLAnchorElement) =>
-  element.classList.contains('mention');
+  element.classList.contains('mention') &&
+  !element.classList.contains('hashtag');
 
 const isHashtagClick = (element: HTMLAnchorElement) =>
   element.textContent?.[0] === '#' ||
   element.previousSibling?.textContent?.endsWith('#');
 
-export const useLinks = () => {
+export const useLinks = (skipHashtags?: boolean) => {
   const history = useHistory();
   const dispatch = useAppDispatch();
 
@@ -61,12 +62,12 @@ export const useLinks = () => {
       if (isMentionClick(target)) {
         e.preventDefault();
         void handleMentionClick(target);
-      } else if (isHashtagClick(target)) {
+      } else if (isHashtagClick(target) && !skipHashtags) {
         e.preventDefault();
         handleHashtagClick(target);
       }
     },
-    [handleMentionClick, handleHashtagClick],
+    [skipHashtags, handleMentionClick, handleHashtagClick],
   );
 
   return handleClick;

app/javascript/mastodon/models/account.ts

@@ -126,6 +126,9 @@ export function createAccountFromServerJSON(serverJSON: ApiAccountJSON) {
       ? accountJSON.username
       : accountJSON.display_name;
 
+  const accountNote =
+    accountJSON.note && accountJSON.note !== '<p></p>' ? accountJSON.note : '';
+
   return AccountFactory({
     ...accountJSON,
     moved: moved?.id,
@@ -142,8 +145,8 @@ export function createAccountFromServerJSON(serverJSON: ApiAccountJSON) {
       escapeTextContentForBrowser(displayName),
       emojiMap,
     ),
-    note_emojified: emojify(accountJSON.note, emojiMap),
-    note_plain: unescapeHTML(accountJSON.note),
+    note_emojified: emojify(accountNote, emojiMap),
+    note_plain: unescapeHTML(accountNote),
     url:
       accountJSON.url.startsWith('http://') ||
       accountJSON.url.startsWith('https://')

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

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
-    "<h2>#{@status_parser.title}</h2>" 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

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
+    "<h2>#{@parser.title}</h2>" if @parser.title.present?
+  end
+
+  def summary
+    @parser.spoiler_text
+  end
+
+  def url
+    linkify(@parser.url || @parser.uri)
+  end
+end

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 "<h2>Foo bar</h2>\n\n<p><a href=\"https://example.com/video\" target=\"_blank\" rel=\"nofollow noopener\" translate=\"no\"><span class=\"invisible\">https://</span><span class=\"\">example.com/video</span><span class=\"invisible\"></span></a></p>"
+        end
+      end
+
       context 'with an unverifiable quote of a known post' do
         let(:quoted_status) { Fabricate(:status) }