Merge 80108280ff into 3b52dca405

app/helpers/admin/account_moderation_notes_helper.rb

@@ -23,8 +23,6 @@ module Admin::AccountModerationNotesHelper
     )
   end
 
-  private
-
   def labeled_account_avatar(account)
     safe_join(
       [
@@ -35,6 +33,8 @@ module Admin::AccountModerationNotesHelper
     )
   end
 
+  private
+
   def account_inline_text(account)
     content_tag(:span, account.acct, class: 'username')
   end

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/javascript/styles/mastodon/admin.scss

@@ -300,6 +300,10 @@ $content-width: 840px;
       padding-bottom: 8px;
       margin-bottom: 8px;
       border-bottom: 1px solid var(--background-border-color);
+
+      &.no-border {
+        border-bottom: none;
+      }
     }
 
     h6 {
@@ -898,6 +902,15 @@ a.name-tag,
       justify-content: flex-start;
       border-top: 1px solid var(--background-border-color);
 
+      &__report-id {
+        text-decoration: none;
+        color: $darker-text-color;
+
+        &:hover {
+          color: $highlight-text-color;
+        }
+      }
+
       &__reported-by,
       &__assigned {
         padding: 15px;
@@ -921,6 +934,11 @@ a.name-tag,
         &__icon {
           margin-inline-end: 4px;
           font-weight: 500;
+
+          .name-tag {
+            color: inherit;
+            margin-inline-start: 4px;
+          }
         }
       }
 

app/views/admin/reports/index.html.haml

@@ -30,6 +30,8 @@
       %button.button= t('admin.accounts.search')
       = link_to t('admin.accounts.reset'), admin_reports_path, class: 'button button--dangerous'
 
+%h4.no-border Reports grouped by reported account
+
 - @reports.group_by(&:target_account_id).each_value do |reports|
   - target_account = reports.first.target_account
   .report-card
@@ -50,15 +52,22 @@
       - reports.each do |report|
         .report-card__summary__item
           .report-card__summary__item__reported-by
-            - if report.account.instance_actor?
+            = link_to admin_report_path(report), class: 'report-card__summary__item__report-id' do
-              = site_hostname
+              .one-line= t('admin.reports.report', id: report.id)
-            - elsif report.account.local?
+              - case report.category
-              = admin_account_link_to report.account
+              - when 'legal'
+                Illegal
+              - when 'spam'
+                Spam
+              - when 'violation'
+                Rule Violation
               - else
-              = report.account.domain
+                Other
+
           .report-card__summary__item__content
             = link_to admin_report_path(report) do
-              .one-line= report.comment.presence || t('admin.reports.comment.none')
+              .one-line
+                = report.comment.presence || t('admin.reports.comment.none')
 
               %span.report-card__summary__item__content__icon{ title: t('admin.accounts.statuses') }
                 = material_symbol('comment')
@@ -67,14 +76,29 @@
               %span.report-card__summary__item__content__icon{ title: t('admin.accounts.media_attachments') }
                 = material_symbol('photo_camera')
                 = report.media_attachments_count
-
+              %span.report-card__summary__item__content__icon
+                - if report.account.instance_actor?
+                  = material_symbol('cloud')
+                  = site_hostname
+                - elsif report.account.local?
+                  .name-tag= labeled_account_avatar report.account
+                  -# = material_symbol('person')
+                    = report.account.acct
                   - if report.forwarded?
-                ·
+                    •
-                = t('admin.reports.forwarded_to', domain: target_account.domain)
+                    = t('admin.reports.forwarded')
+                - else
+                  = material_symbol('cloud')
+                  = report.account.domain
 
           .report-card__summary__item__assigned
+            %span.report-card__summary__item__content__icon{ title: t('admin.reports.notes.title') }
+              = material_symbol('comment')
+              = report.notes.count
+              = t('admin.reports.notes.title')
+            %br
             - if report.assigned_account.present?
               = admin_account_link_to report.assigned_account
             - else
-              \-
+              = t 'admin.reports.unassigned'
 = paginate @reports

config/locales/en.yml

@@ -670,7 +670,7 @@ en:
       category: Category
       category_description_html: The reason this account and/or content was reported will be cited in communication with the reported account
       comment:
-        none: None
+        none: No Comment
       comment_description_html: 'To provide more information, %{name} wrote:'
       confirm: Confirm
       confirm_action: Confirm moderation action against @%{acct}