Merge bdc731044c 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/models/preview_card.rb

@@ -33,6 +33,7 @@
 #  published_at                 :datetime
 #  image_description            :string           default(""), not null
 #  author_account_id            :bigint(8)
+#  image_remote_url             :string
 #
 
 class PreviewCard < ApplicationRecord

db/migrate/20240803160904_add_image_remote_url_to_preview_cards.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddImageRemoteURLToPreviewCards < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  def up
+    safety_assured { add_column :preview_cards, :image_remote_url, :string }
+  end
+
+  def down
+    remove_column :preview_cards, :image_remote_url
+  end
+end

db/schema.rb

@@ -904,6 +904,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_06_27_132728) do
     t.datetime "published_at"
     t.string "image_description", default: "", null: false
     t.bigint "author_account_id"
+    t.string "image_remote_url"
     t.index ["author_account_id"], name: "index_preview_cards_on_author_account_id", where: "(author_account_id IS NOT NULL)"
     t.index ["url"], name: "index_preview_cards_on_url", unique: true
   end

spec/fabricators/preview_card_fabricator.rb

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
 Fabricator(:preview_card) do
+  transient :image_remote_url
+
   url { Faker::Internet.url }
   title { Faker::Lorem.sentence }
   description { Faker::Lorem.paragraph }
   type 'link'
   image { attachment_fixture('attachment.jpg') }
+
+  after_build { |preview_card, transients| preview_card[:image_remote_url] = transients[:image_remote_url] }
 end

spec/services/fetch_link_card_service_spec.rb

@@ -7,8 +7,16 @@ RSpec.describe FetchLinkCardService do
 
   let(:html) { '<!doctype html><title>Hello world</title>' }
   let(:oembed_cache) { nil }
+  let(:preview_card) { nil }
 
   before do
+    if preview_card
+      allow(preview_card).to receive(:download_image!).with(anything).and_call_original
+
+      allow(PreviewCard).to receive(:find_by).with(any_args).and_return(nil)
+      allow(PreviewCard).to receive(:find_by).with(url: preview_card.url).and_return(preview_card)
+    end
+
     stub_request(:get, 'http://example.com/html').to_return(headers: { 'Content-Type' => 'text/html' }, body: html)
     stub_request(:get, 'http://example.com/not-found').to_return(status: 404, headers: { 'Content-Type' => 'text/html' }, body: html)
     stub_request(:get, 'http://example.com/text').to_return(status: 404, headers: { 'Content-Type' => 'text/plain' }, body: 'Hello')
@@ -34,6 +42,8 @@ RSpec.describe FetchLinkCardService do
     stub_request(:get, 'http://example.com/long_canonical_url').to_return(request_fixture('long_canonical_url.txt'))
     stub_request(:get, 'http://example.com/alternative_utf8_spelling_in_header').to_return(request_fixture('alternative_utf8_spelling_in_header.txt'))
 
+    stub_request(:get, 'http://example.com/image.jpeg').to_return(request_fixture('attachment1.txt'))
+
     Rails.cache.write('oembed_endpoint:example.com', oembed_cache) if oembed_cache
 
     subject.call(status)
@@ -89,6 +99,7 @@ RSpec.describe FetchLinkCardService do
 
       it 'creates preview card' do
         expect(status.preview_card).to_not be_nil
+        expect(status.preview_card.original_url).to eq 'http://example.com/redirect'
         expect(status.preview_card.url).to eq 'http://example.com/html'
         expect(status.preview_card.title).to eq 'Hello world'
       end
@@ -235,6 +246,18 @@ RSpec.describe FetchLinkCardService do
       end
     end
 
+    context 'with URL of a page with an og:image tag' do
+      let(:status) { Fabricate(:status, text: 'http://example.com/html') }
+      let(:html) { '<!doctype html><title>Hello world</title><meta property="og:image" content="http://example.com/image.jpeg">' }
+
+      it 'creates preview card with image' do
+        expect(status.preview_card.image_remote_url).to eq 'http://example.com/image.jpeg'
+        expect(status.preview_card.image).to_not be_nil
+        expect(status.preview_card.width).to eq 1136
+        expect(status.preview_card.height).to eq 852
+      end
+    end
+
     context 'with a URL of a page with oEmbed support' do
       let(:html) { '<!doctype html><title>Hello world</title><link rel="alternate" type="application/json+oembed" href="http://example.com/oembed?url=http://example.com/html">' }
       let(:status) { Fabricate(:status, text: 'http://example.com/html') }
@@ -321,4 +344,75 @@ RSpec.describe FetchLinkCardService do
       expect(a_request(:get, 'https://quitter.se/tag/wannacry')).to_not have_been_made
     end
   end
+
+  context 'when preview card already exists' do
+    let(:updated_at) { 1.hour.ago.beginning_of_minute }
+    let(:image_url) { 'http://example.com/image.jpeg' }
+    let(:preview_card) { Fabricate(:preview_card, url: 'http://example.com/html', title: 'Old news', updated_at: updated_at, image_remote_url: image_url, image: image_url && attachment_fixture('attachment.jpg')) }
+    let(:status) { Fabricate(:status, text: 'http://example.com/html') }
+    let(:html) { '<!doctype html><title>Hello world</title><meta property="og:image" content="http://example.com/image.jpeg">' }
+
+    context 'when card is recently updated' do
+      it 'leaves existing card unchanged' do
+        expect(status.preview_card).to eq preview_card
+        expect(status.preview_card.updated_at).to eq updated_at
+        expect(status.preview_card.url).to eq 'http://example.com/html'
+        expect(status.preview_card.title).to eq 'Old news'
+        expect(status.preview_card.image).to_not be_nil
+        expect(status.preview_card).to_not have_received(:download_image!)
+      end
+    end
+
+    context 'when card is stale' do
+      let(:updated_at) { 3.weeks.ago }
+
+      it 'updates existing card' do
+        expect(status.preview_card).to eq preview_card
+        expect(status.preview_card.updated_at).to_not eq updated_at
+        expect(status.preview_card.url).to eq 'http://example.com/html'
+        expect(status.preview_card.title).to eq 'Hello world'
+        expect(preview_card).to_not have_received(:download_image!)
+      end
+
+      context 'when page has different image' do
+        let(:image_url) { 'http://example.com/old.jpeg' }
+
+        it 'updates existing card' do
+          expect(status.preview_card).to eq preview_card
+          expect(status.preview_card.url).to eq 'http://example.com/html'
+          expect(status.preview_card.title).to eq 'Hello world'
+          expect(status.preview_card).to have_received(:download_image!)
+          expect(status.preview_card.image_remote_url).to eq 'http://example.com/image.jpeg'
+          expect(status.preview_card.width).to eq 1136
+          expect(status.preview_card.height).to eq 852
+        end
+      end
+    end
+
+    context 'when card has no image' do
+      let(:image_url) { nil }
+
+      it 'updates existing card' do
+        expect(status.preview_card).to eq preview_card
+        expect(status.preview_card.url).to eq 'http://example.com/html'
+        expect(status.preview_card.title).to eq 'Hello world'
+        expect(status.preview_card).to have_received(:download_image!)
+        expect(status.preview_card.image_remote_url).to eq 'http://example.com/image.jpeg'
+        expect(status.preview_card.width).to eq 1136
+        expect(status.preview_card.height).to eq 852
+      end
+    end
+
+    context 'with a redirect URL' do
+      let(:status) { Fabricate(:status, text: 'http://example.com/redirect') }
+
+      it 'updates existing card' do
+        expect(status.preview_card).to eq preview_card
+        expect(status.preview_card.original_url).to eq 'http://example.com/redirect'
+        expect(status.preview_card.url).to eq 'http://example.com/html'
+        expect(status.preview_card.title).to eq 'Hello world'
+        expect(preview_card).to_not have_received(:download_image!)
+      end
+    end
+  end
 end