Merge 4393bd395a into 94bceb8683

app/helpers/context_helper.rb

@@ -26,12 +26,6 @@ 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,30 +1,12 @@
-import { useCallback } from 'react';
-
 import { useLinks } from 'mastodon/hooks/useLinks';
 
-interface AccountBioProps {
+export const AccountBio: React.FC<{
   note: string;
   className: string;
-  dropdownAccountId?: string;
-}
+}> = ({ note, className }) => {
+  const handleClick = useLinks();
 
-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) {
+  if (note.length === 0 || note === '<p></p>') {
     return null;
   }
 
@@ -33,28 +15,6 @@ export const AccountBio: React.FC<AccountBioProps> = ({
       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,7 +6,6 @@ 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';
@@ -774,6 +773,7 @@ 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,11 +897,12 @@ export const AccountHeader: React.FC<{
                   <AccountNote accountId={accountId} />
                 )}
 
-                <AccountBio
-                  note={account.note_emojified}
-                  dropdownAccountId={accountId}
-                  className='account__header__content'
-                />
+                {account.note.length > 0 && account.note !== '<p></p>' && (
+                  <div
+                    className='account__header__content translate'
+                    dangerouslySetInnerHTML={content}
+                  />
+                )}
 
                 <div className='account__header__fields'>
                   <dl>

app/javascript/mastodon/hooks/useLinks.ts

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

app/javascript/mastodon/models/account.ts

@@ -126,9 +126,6 @@ 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,
@@ -145,8 +142,8 @@ export function createAccountFromServerJSON(serverJSON: ApiAccountJSON) {
       escapeTextContentForBrowser(displayName),
       emojiMap,
     ),
-    note_emojified: emojify(accountNote, emojiMap),
-    note_plain: unescapeHTML(accountNote),
+    note_emojified: emojify(accountJSON.note, emojiMap),
+    note_plain: unescapeHTML(accountJSON.note),
     url:
       accountJSON.url.startsWith('http://') ||
       accountJSON.url.startsWith('https://')