Merge 41118205be 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 }) => {
+  dropdownAccountId?: string;
-  const handleClick = useLinks();
+}
 
-  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>' && (
+                <AccountBio
-                  <div
+                  note={account.note_emojified}
-                    className='account__header__content translate'
+                  dropdownAccountId={accountId}
-                    dangerouslySetInnerHTML={content}
+                  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_emojified: emojify(accountNote, emojiMap),
-    note_plain: unescapeHTML(accountJSON.note),
+    note_plain: unescapeHTML(accountNote),
     url:
       accountJSON.url.startsWith('http://') ||
       accountJSON.url.startsWith('https://')

app/services/fetch_link_card_service.rb

@@ -106,12 +106,11 @@ class FetchLinkCardService < BaseService
   end
 
   def attempt_oembed
-    service         = FetchOEmbedService.new
+    service = FetchOEmbedService.new
-    url_domain      = Addressable::URI.parse(@url).normalized_host
-    cached_endpoint = Rails.cache.read("oembed_endpoint:#{url_domain}")
 
-    embed   = service.call(@url, cached_endpoint: cached_endpoint) unless cached_endpoint.nil?
+    embed   = service.call(@url, use_cached_endpoint: true)
     embed ||= service.call(@url, html: html) unless html.nil?
+    embed ||= service.call(@url, use_cached_endpoint: true) if @url != @original_url.to_s
 
     return false if embed.nil?
 

app/services/fetch_oembed_service.rb

@@ -10,7 +10,7 @@ class FetchOEmbedService
     @url     = url
     @options = options
 
-    if @options[:cached_endpoint]
+    if @options[:use_cached_endpoint]
       parse_cached_endpoint!
     else
       discover_endpoint!
@@ -57,9 +57,9 @@ class FetchOEmbedService
   end
 
   def parse_cached_endpoint!
-    cached = @options[:cached_endpoint]
+    cached = Rails.cache.read(cache_key)
 
-    return if cached[:endpoint].nil? || cached[:format].nil?
+    return if cached.nil? || cached[:endpoint].nil? || cached[:format].nil?
 
     @endpoint_url = Addressable::Template.new(cached[:endpoint]).expand(url: @url).to_s
     @format       = cached[:format]
@@ -68,14 +68,16 @@ class FetchOEmbedService
   def cache_endpoint!
     return unless URL_REGEX.match?(@endpoint_url)
 
-    url_domain = Addressable::URI.parse(@url).normalized_host
-
     endpoint_hash = {
       endpoint: @endpoint_url.gsub(URL_REGEX, '={url}'),
       format: @format,
     }
 
-    Rails.cache.write("oembed_endpoint:#{url_domain}", endpoint_hash, expires_in: ENDPOINT_CACHE_EXPIRES_IN)
+    Rails.cache.write(cache_key, endpoint_hash, expires_in: ENDPOINT_CACHE_EXPIRES_IN)
+  end
+
+  def cache_key
+    "oembed_endpoint:#{Addressable::URI.parse(@url).normalized_host}"
   end
 
   def fetch!

spec/services/fetch_link_card_service_spec.rb

@@ -13,6 +13,7 @@ RSpec.describe FetchLinkCardService do
     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')
     stub_request(:get, 'http://example.com/redirect').to_return(status: 302, headers: { 'Location' => 'http://example.com/html' })
+    stub_request(:get, 'http://example.net/redirect-to-other-domain').to_return(status: 302, headers: { 'Location' => 'http://example.com/html' })
     stub_request(:get, 'http://example.com/redirect-to-404').to_return(status: 302, headers: { 'Location' => 'http://example.com/not-found' })
     stub_request(:get, 'http://example.com/oembed?url=http://example.com/html').to_return(headers: { 'Content-Type' => 'application/json' }, body: '{ "version": "1.0", "type": "link", "title": "oEmbed title" }')
     stub_request(:get, 'http://example.com/oembed?format=json&url=http://example.com/html').to_return(headers: { 'Content-Type' => 'application/json' }, body: '{ "version": "1.0", "type": "link", "title": "oEmbed title" }')
@@ -264,6 +265,39 @@ RSpec.describe FetchLinkCardService do
         end
       end
 
+      context 'when oEmbed endpoint cache populated with redirect target' do
+        let(:status) { Fabricate(:status, text: 'http://example.net/redirect-to-other-domain') }
+        let(:oembed_cache) { { endpoint: 'http://example.com/oembed?format=json&url={url}', format: :json } }
+
+        it 'uses the cached oEmbed response' do
+          expect(a_request(:get, 'http://example.net/redirect-to-other-domain')).to have_been_made
+          expect(a_request(:get, 'http://example.com/oembed?url=http://example.com/html')).to have_been_made
+        end
+
+        it 'creates preview card' do
+          expect(status.preview_card).to_not be_nil
+          expect(status.preview_card.url).to eq 'http://example.com/html'
+          expect(status.preview_card.title).to eq 'oEmbed title'
+        end
+      end
+
+      context 'when oEmbed endpoint cache populated with redirect target but page contains no oEmbed tags' do
+        let(:status) { Fabricate(:status, text: 'http://example.net/redirect-to-other-domain') }
+        let(:html) { 'Please fill out CAPTCHA' }
+        let(:oembed_cache) { { endpoint: 'http://example.com/oembed?format=json&url={url}', format: :json } }
+
+        it 'uses the cached oEmbed response' do
+          expect(a_request(:get, 'http://example.net/redirect-to-other-domain')).to have_been_made
+          expect(a_request(:get, 'http://example.com/oembed?format=json&url=http://example.com/html')).to have_been_made
+        end
+
+        it 'creates preview card' do
+          expect(status.preview_card).to_not be_nil
+          expect(status.preview_card.url).to eq 'http://example.com/html'
+          expect(status.preview_card.title).to eq 'oEmbed title'
+        end
+      end
+
       # If the original HTML URL for whatever reason (e.g. DOS protection) redirects to
       # an error page, we can still use the cached oEmbed but should not use the
       # redirect URL on the card.

spec/services/fetch_oembed_service_spec.rb

@@ -160,10 +160,12 @@ RSpec.describe FetchOEmbedService do
           headers: { 'Content-Type': 'text/html' },
           body: request_fixture('oembed_json_empty.html')
         )
+
+        Rails.cache.write('oembed_endpoint:www.youtube.com', { endpoint: 'http://www.youtube.com/oembed?format=json&url={url}', format: :json })
       end
 
       it 'returns new provider without fetching original URL first' do
-        subject.call('https://www.youtube.com/watch?v=dqwpQarrDwk', cached_endpoint: { endpoint: 'http://www.youtube.com/oembed?format=json&url={url}', format: :json })
+        subject.call('https://www.youtube.com/watch?v=dqwpQarrDwk', use_cached_endpoint: true)
         expect(a_request(:get, 'https://www.youtube.com/watch?v=dqwpQarrDwk')).to_not have_been_made
         expect(subject.endpoint_url).to eq 'http://www.youtube.com/oembed?format=json&url=https%3A%2F%2Fwww.youtube.com%2Fwatch%3Fv%3DdqwpQarrDwk'
         expect(subject.format).to eq :json