Merge f9c8c00523 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/concerns/status/mappings.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Status::Mappings
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def bookmarks_map(status_ids, account_id)
+      Bookmark
+        .where(status_id: status_ids, account_id: account_id)
+        .pluck(:status_id)
+        .index_with(true)
+    end
+
+    def favourites_map(status_ids, account_id)
+      Favourite
+        .where(status_id: status_ids, account_id: account_id)
+        .pluck(:status_id)
+        .index_with(true)
+    end
+
+    def mutes_map(conversation_ids, account_id)
+      ConversationMute
+        .where(conversation_id: conversation_ids, account_id: account_id)
+        .pluck(:conversation_id)
+        .index_with(true)
+    end
+
+    def pins_map(status_ids, account_id)
+      StatusPin
+        .where(status_id: status_ids, account_id: account_id)
+        .pluck(:status_id)
+        .index_with(true)
+    end
+
+    def reblogs_map(status_ids, account_id)
+      Status
+        .unscoped
+        .where(reblog_of_id: status_ids, account_id: account_id)
+        .pluck(:reblog_of_id)
+        .index_with(true)
+    end
+  end
+end

app/models/status.rb

@@ -38,6 +38,7 @@ class Status < ApplicationRecord
   include RateLimitable
   include Status::FaspConcern
   include Status::FetchRepliesConcern
+  include Status::Mappings
   include Status::SafeReblogInsert
   include Status::SearchConcern
   include Status::SnapshotConcern
@@ -353,26 +354,6 @@ class Status < ApplicationRecord
   end
 
   class << self
-    def favourites_map(status_ids, account_id)
-      Favourite.select(:status_id).where(status_id: status_ids).where(account_id: account_id).each_with_object({}) { |f, h| h[f.status_id] = true }
-    end
-
-    def bookmarks_map(status_ids, account_id)
-      Bookmark.select(:status_id).where(status_id: status_ids).where(account_id: account_id).to_h { |f| [f.status_id, true] }
-    end
-
-    def reblogs_map(status_ids, account_id)
-      unscoped.select(:reblog_of_id).where(reblog_of_id: status_ids).where(account_id: account_id).each_with_object({}) { |s, h| h[s.reblog_of_id] = true }
-    end
-
-    def mutes_map(conversation_ids, account_id)
-      ConversationMute.select(:conversation_id).where(conversation_id: conversation_ids).where(account_id: account_id).each_with_object({}) { |m, h| h[m.conversation_id] = true }
-    end
-
-    def pins_map(status_ids, account_id)
-      StatusPin.select(:status_id).where(status_id: status_ids).where(account_id: account_id).each_with_object({}) { |p, h| h[p.status_id] = true }
-    end
-
     def from_text(text)
       return [] if text.blank?
 

spec/models/concerns/status/mappings_spec.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Status::Mappings do
+  describe '.bookmarks_map' do
+    subject { Status.bookmarks_map([status], account) }
+
+    let(:status)  { Fabricate(:status) }
+    let(:account) { Fabricate(:account) }
+
+    context 'with a bookmarkeded status' do
+      before { Fabricate(:bookmark, account: account, status: status) }
+
+      it { is_expected.to be_a(Hash).and include(status.id => true) }
+    end
+  end
+
+  describe '.favourites_map' do
+    subject { Status.favourites_map([status], account) }
+
+    let(:status)  { Fabricate(:status) }
+    let(:account) { Fabricate(:account) }
+
+    context 'with a favourited status' do
+      before { Fabricate(:favourite, status: status, account: account) }
+
+      it { is_expected.to be_a(Hash).and include(status.id => true) }
+    end
+  end
+
+  describe '.mutes_map' do
+    subject { Status.mutes_map([status.conversation.id], account) }
+
+    let(:status)  { Fabricate(:status) }
+    let(:account) { Fabricate(:account) }
+
+    context 'with a muted conversation' do
+      before { account.mute_conversation!(status.conversation) }
+
+      it { is_expected.to be_a(Hash).and include(status.conversation_id => true) }
+    end
+  end
+
+  describe '.pins_map' do
+    subject { Status.pins_map([status], account) }
+
+    let(:status)  { Fabricate(:status, account: account) }
+    let(:account) { Fabricate(:account) }
+
+    context 'with a pinned status' do
+      before { Fabricate(:status_pin, account: account, status: status) }
+
+      it { is_expected.to be_a(Hash).and include(status.id => true) }
+    end
+  end
+
+  describe '.reblogs_map' do
+    subject { Status.reblogs_map([status], account) }
+
+    let(:status)  { Fabricate(:status) }
+    let(:account) { Fabricate(:account) }
+
+    context 'with a reblogged status' do
+      before { Fabricate(:status, account: account, reblog: status) }
+
+      it { is_expected.to be_a(Hash).and include(status.id => true) }
+    end
+  end
+end

spec/models/status_spec.rb

@@ -317,54 +317,6 @@ RSpec.describe Status do
     end
   end
 
-  describe '.mutes_map' do
-    subject { described_class.mutes_map([status.conversation.id], account) }
-
-    let(:status)  { Fabricate(:status) }
-    let(:account) { Fabricate(:account) }
-
-    it 'returns a hash' do
-      expect(subject).to be_a Hash
-    end
-
-    it 'contains true value' do
-      account.mute_conversation!(status.conversation)
-      expect(subject[status.conversation.id]).to be true
-    end
-  end
-
-  describe '.favourites_map' do
-    subject { described_class.favourites_map([status], account) }
-
-    let(:status)  { Fabricate(:status) }
-    let(:account) { Fabricate(:account) }
-
-    it 'returns a hash' do
-      expect(subject).to be_a Hash
-    end
-
-    it 'contains true value' do
-      Fabricate(:favourite, status: status, account: account)
-      expect(subject[status.id]).to be true
-    end
-  end
-
-  describe '.reblogs_map' do
-    subject { described_class.reblogs_map([status], account) }
-
-    let(:status)  { Fabricate(:status) }
-    let(:account) { Fabricate(:account) }
-
-    it 'returns a hash' do
-      expect(subject).to be_a Hash
-    end
-
-    it 'contains true value' do
-      Fabricate(:status, account: account, reblog: status)
-      expect(subject[status.id]).to be true
-    end
-  end
-
   describe '.only_reblogs' do
     let!(:status) { Fabricate :status }
     let!(:reblog) { Fabricate :status, reblog: Fabricate(:status) }