Merge commit '2664bb628b7bf77b9efa4143423486cf16d17ba7' into glitch-soc/merge-upstream

.ruby-version

@@ -1 +1 @@
-3.4.5
+3.4.6

Dockerfile

@@ -13,7 +13,7 @@ ARG BASE_REGISTRY="docker.io"
 
 # Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.4.x"]
 # renovate: datasource=docker depName=docker.io/ruby
-ARG RUBY_VERSION="3.4.5"
+ARG RUBY_VERSION="3.4.6"
 # # Node.js version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="20"]
 # renovate: datasource=node-version depName=node
 ARG NODE_MAJOR_VERSION="22"

app/controllers/concerns/api/interaction_policies_concern.rb

@@ -14,7 +14,7 @@ module Api::InteractionPoliciesConcern
     when 'nobody'
       0
     when nil
-      current_user.setting_default_quote_policy
+      Status::QUOTE_APPROVAL_POLICY_FLAGS[current_user.setting_default_quote_policy&.to_sym] << 16
     else
       # TODO: raise more useful message
       raise ActiveRecord::RecordInvalid

app/javascript/mastodon/actions/importer/normalizer.js

@@ -81,7 +81,7 @@ export function normalizeStatus(status, normalOldStatus) {
   } else {
     // If the status has a CW but no contents, treat the CW as if it were the
     // status' contents, to avoid having a CW toggle with seemingly no effect.
-    if (normalStatus.spoiler_text && !normalStatus.content) {
+    if (normalStatus.spoiler_text && !normalStatus.content && !normalStatus.quote) {
       normalStatus.content = normalStatus.spoiler_text;
       normalStatus.spoiler_text = '';
     }

app/javascript/mastodon/components/__tests__/__snapshots__/display_name-test.jsx.snap

@@ -1,27 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`<DisplayName /> > renders display name + account name 1`] = `
-<span
-  className="display-name"
-  onMouseEnter={[Function]}
-  onMouseLeave={[Function]}
->
-  <bdi>
-    <strong
-      className="display-name__html"
-      dangerouslySetInnerHTML={
-        {
-          "__html": "<p>Foo</p>",
-        }
-      }
-    />
-  </bdi>
-   
-  <span
-    className="display-name__account"
-  >
-    @
-    bar@baz
-  </span>
-</span>
-`;

app/javascript/mastodon/components/__tests__/display_name-test.jsx

@@ -1,19 +0,0 @@
-import { fromJS }  from 'immutable';
-
-import renderer from 'react-test-renderer';
-
-import { DisplayName } from '../display_name';
-
-describe('<DisplayName />', () => {
-  it('renders display name + account name', () => {
-    const account = fromJS({
-      username: 'bar',
-      acct: 'bar@baz',
-      display_name_html: '<p>Foo</p>',
-    });
-    const component = renderer.create(<DisplayName account={account} />);
-    const tree      = component.toJSON();
-
-    expect(tree).toMatchSnapshot();
-  });
-});

app/javascript/mastodon/components/display_name.tsx

@@ -1,122 +0,0 @@
-import React from 'react';
-
-import type { List } from 'immutable';
-
-import type { Account } from 'mastodon/models/account';
-
-import { autoPlayGif } from '../initial_state';
-
-import { Skeleton } from './skeleton';
-
-interface Props {
-  account?: Account;
-  others?: List<Account>;
-  localDomain?: string;
-}
-
-export class DisplayName extends React.PureComponent<Props> {
-  handleMouseEnter: React.ReactEventHandler<HTMLSpanElement> = ({
-    currentTarget,
-  }) => {
-    if (autoPlayGif) {
-      return;
-    }
-
-    const emojis =
-      currentTarget.querySelectorAll<HTMLImageElement>('img.custom-emoji');
-
-    emojis.forEach((emoji) => {
-      const originalSrc = emoji.getAttribute('data-original');
-      if (originalSrc != null) emoji.src = originalSrc;
-    });
-  };
-
-  handleMouseLeave: React.ReactEventHandler<HTMLSpanElement> = ({
-    currentTarget,
-  }) => {
-    if (autoPlayGif) {
-      return;
-    }
-
-    const emojis =
-      currentTarget.querySelectorAll<HTMLImageElement>('img.custom-emoji');
-
-    emojis.forEach((emoji) => {
-      const staticSrc = emoji.getAttribute('data-static');
-      if (staticSrc != null) emoji.src = staticSrc;
-    });
-  };
-
-  render() {
-    const { others, localDomain } = this.props;
-
-    let displayName: React.ReactNode,
-      suffix: React.ReactNode,
-      account: Account | undefined;
-
-    if (others && others.size > 0) {
-      account = others.first();
-    } else if (this.props.account) {
-      account = this.props.account;
-    }
-
-    if (others && others.size > 1) {
-      displayName = others
-        .take(2)
-        .map((a) => (
-          <bdi key={a.get('id')}>
-            <strong
-              className='display-name__html'
-              dangerouslySetInnerHTML={{ __html: a.get('display_name_html') }}
-            />
-          </bdi>
-        ))
-        .reduce((prev, cur) => [prev, ', ', cur]);
-
-      if (others.size - 2 > 0) {
-        suffix = `+${others.size - 2}`;
-      }
-    } else if (account) {
-      let acct = account.get('acct');
-
-      if (!acct.includes('@') && localDomain) {
-        acct = `${acct}@${localDomain}`;
-      }
-
-      displayName = (
-        <bdi>
-          <strong
-            className='display-name__html'
-            dangerouslySetInnerHTML={{
-              __html: account.get('display_name_html'),
-            }}
-          />
-        </bdi>
-      );
-      suffix = <span className='display-name__account'>@{acct}</span>;
-    } else {
-      displayName = (
-        <bdi>
-          <strong className='display-name__html'>
-            <Skeleton width='10ch' />
-          </strong>
-        </bdi>
-      );
-      suffix = (
-        <span className='display-name__account'>
-          <Skeleton width='7ch' />
-        </span>
-      );
-    }
-
-    return (
-      <span
-        className='display-name'
-        onMouseEnter={this.handleMouseEnter}
-        onMouseLeave={this.handleMouseLeave}
-      >
-        {displayName} {suffix}
-      </span>
-    );
-  }
-}

app/javascript/mastodon/components/display_name/default.tsx

@@ -0,0 +1,36 @@
+import { useMemo } from 'react';
+import type { ComponentPropsWithoutRef, FC } from 'react';
+
+import { Skeleton } from '../skeleton';
+
+import type { DisplayNameProps } from './index';
+import { DisplayNameWithoutDomain } from './no-domain';
+
+export const DisplayNameDefault: FC<
+  Omit<DisplayNameProps, 'variant'> & ComponentPropsWithoutRef<'span'>
+> = ({ account, localDomain, className, ...props }) => {
+  const username = useMemo(() => {
+    if (!account) {
+      return null;
+    }
+    let acct = account.get('acct');
+
+    if (!acct.includes('@') && localDomain) {
+      acct = `${acct}@${localDomain}`;
+    }
+    return `@${acct}`;
+  }, [account, localDomain]);
+
+  return (
+    <DisplayNameWithoutDomain
+      account={account}
+      className={className}
+      {...props}
+    >
+      {' '}
+      <span className='display-name__account'>
+        {username ?? <Skeleton width='7ch' />}
+      </span>
+    </DisplayNameWithoutDomain>
+  );
+};

app/javascript/mastodon/components/display_name/display_name.stories.tsx

@@ -18,8 +18,6 @@ const meta = {
     username: 'mastodon@mastodon.social',
     name: 'Test User 🧪',
     loading: false,
-    simple: false,
-    noDomain: false,
     localDomain: 'mastodon.social',
   },
   tags: [],
@@ -50,13 +48,13 @@ export const Loading: Story = {
 
 export const NoDomain: Story = {
   args: {
-    noDomain: true,
+    variant: 'noDomain',
   },
 };
 
 export const Simple: Story = {
   args: {
-    simple: true,
+    variant: 'simple',
   },
 };
 
@@ -76,6 +74,6 @@ export const Linked: Story = {
           acct: username,
         })
       : undefined;
-    return <LinkedDisplayName {...args} account={account} />;
+    return <LinkedDisplayName {...args} displayProps={{ account }} />;
   },
 };

app/javascript/mastodon/components/display_name/index.tsx

@@ -1,110 +1,37 @@
 import type { ComponentPropsWithoutRef, FC } from 'react';
-import { useMemo } from 'react';
 
-import classNames from 'classnames';
 import type { LinkProps } from 'react-router-dom';
 import { Link } from 'react-router-dom';
 
-import { EmojiHTML } from '@/mastodon/features/emoji/emoji_html';
 import type { Account } from '@/mastodon/models/account';
-import { isModernEmojiEnabled } from '@/mastodon/utils/environment';
 
-import { Skeleton } from '../skeleton';
+import { DisplayNameDefault } from './default';
+import { DisplayNameWithoutDomain } from './no-domain';
+import { DisplayNameSimple } from './simple';
 
-interface Props {
+export interface DisplayNameProps {
   account?: Account;
   localDomain?: string;
-  simple?: boolean;
+  variant?: 'default' | 'simple' | 'noDomain';
-  noDomain?: boolean;
 }
 
-export const DisplayName: FC<Props & ComponentPropsWithoutRef<'span'>> = ({
+export const DisplayName: FC<
-  account,
+  DisplayNameProps & ComponentPropsWithoutRef<'span'>
-  localDomain,
+> = ({ variant = 'default', ...props }) => {
-  simple = false,
+  if (variant === 'simple') {
-  noDomain = false,
+    return <DisplayNameSimple {...props} />;
-  className,
+  } else if (variant === 'noDomain') {
-  ...props
+    return <DisplayNameWithoutDomain {...props} />;
-}) => {
-  const username = useMemo(() => {
-    if (!account || noDomain) {
-      return null;
-    }
-    let acct = account.get('acct');
-
-    if (!acct.includes('@') && localDomain) {
-      acct = `${acct}@${localDomain}`;
-    }
-    return `@${acct}`;
-  }, [account, localDomain, noDomain]);
-
-  if (!account) {
-    if (simple) {
-      return null;
-    }
-    return (
-      <span {...props} className={classNames('display-name', className)}>
-        <bdi>
-          <strong className='display-name__html'>
-            <Skeleton width='10ch' />
-          </strong>
-        </bdi>
-        {!noDomain && (
-          <span className='display-name__account'>
-            &nbsp;
-            <Skeleton width='7ch' />
-          </span>
-        )}
-      </span>
-    );
   }
-  const accountName = isModernEmojiEnabled()
+  return <DisplayNameDefault {...props} />;
-    ? account.get('display_name')
-    : account.get('display_name_html');
-  if (simple) {
-    return (
-      <bdi>
-        <EmojiHTML {...props} htmlString={accountName} shallow as='span' />
-      </bdi>
-    );
-  }
-
-  return (
-    <span {...props} className={classNames('display-name', className)}>
-      <bdi>
-        <EmojiHTML
-          className='display-name__html'
-          htmlString={accountName}
-          shallow
-          as='strong'
-        />
-      </bdi>
-      {username && (
-        <span className='display-name__account'>&nbsp;{username}</span>
-      )}
-    </span>
-  );
 };
 
 export const LinkedDisplayName: FC<
-  Props & { asProps?: ComponentPropsWithoutRef<'span'> } & Partial<LinkProps>
+  Omit<LinkProps, 'to'> & {
-> = ({
+    displayProps: DisplayNameProps & ComponentPropsWithoutRef<'span'>;
-  account,
+  }
-  asProps = {},
+> = ({ displayProps, children, ...linkProps }) => {
-  className,
+  const { account } = displayProps;
-  localDomain,
-  simple,
-  noDomain,
-  ...linkProps
-}) => {
-  const displayProps = {
-    account,
-    className,
-    localDomain,
-    simple,
-    noDomain,
-    ...asProps,
-  };
   if (!account) {
     return <DisplayName {...displayProps} />;
   }
@@ -113,9 +40,11 @@ export const LinkedDisplayName: FC<
     <Link
       to={`/@${account.acct}`}
       title={`@${account.acct}`}
+      data-id={account.id}
       data-hover-card-account={account.id}
       {...linkProps}
     >
+      {children}
       <DisplayName {...displayProps} />
     </Link>
   );

app/javascript/mastodon/components/display_name/no-domain.tsx

@@ -0,0 +1,39 @@
+import type { ComponentPropsWithoutRef, FC } from 'react';
+
+import classNames from 'classnames';
+
+import { EmojiHTML } from '@/mastodon/features/emoji/emoji_html';
+import { isModernEmojiEnabled } from '@/mastodon/utils/environment';
+
+import { Skeleton } from '../skeleton';
+
+import type { DisplayNameProps } from './index';
+
+export const DisplayNameWithoutDomain: FC<
+  Omit<DisplayNameProps, 'variant' | 'localDomain'> &
+    ComponentPropsWithoutRef<'span'>
+> = ({ account, className, children, ...props }) => {
+  return (
+    <span {...props} className={classNames('display-name', className)}>
+      <bdi>
+        {account ? (
+          <EmojiHTML
+            className='display-name__html'
+            htmlString={
+              isModernEmojiEnabled()
+                ? account.get('display_name')
+                : account.get('display_name_html')
+            }
+            shallow
+            as='strong'
+          />
+        ) : (
+          <strong className='display-name__html'>
+            <Skeleton width='10ch' />
+          </strong>
+        )}
+      </bdi>
+      {children}
+    </span>
+  );
+};

app/javascript/mastodon/components/display_name/simple.tsx

@@ -0,0 +1,23 @@
+import type { ComponentPropsWithoutRef, FC } from 'react';
+
+import { EmojiHTML } from '@/mastodon/features/emoji/emoji_html';
+import { isModernEmojiEnabled } from '@/mastodon/utils/environment';
+
+import type { DisplayNameProps } from './index';
+
+export const DisplayNameSimple: FC<
+  Omit<DisplayNameProps, 'variant' | 'localDomain'> &
+    ComponentPropsWithoutRef<'span'>
+> = ({ account, ...props }) => {
+  if (!account) {
+    return null;
+  }
+  const accountName = isModernEmojiEnabled()
+    ? account.get('display_name')
+    : account.get('display_name_html');
+  return (
+    <bdi>
+      <EmojiHTML {...props} htmlString={accountName} shallow as='span' />
+    </bdi>
+  );
+};

app/javascript/mastodon/components/status.jsx

@@ -28,7 +28,7 @@ import { displayMedia } from '../initial_state';
 
 import { Avatar } from './avatar';
 import { AvatarOverlay } from './avatar_overlay';
-import { DisplayName } from './display_name';
+import { LinkedDisplayName } from './display_name';
 import { getHashtagBarForStatus } from './hashtag_bar';
 import { RelativeTimestamp } from './relative_timestamp';
 import StatusActionBar from './status_action_bar';
@@ -409,12 +409,20 @@ class Status extends ImmutablePureComponent {
     const matchedFilters = status.get('matched_filters');
 
     if (status.get('reblog', null) !== null && typeof status.get('reblog') === 'object') {
-      const display_name_html = { __html: status.getIn(['account', 'display_name_html']) };
+      const name = (
+        <LinkedDisplayName
+          displayProps={{
+            account: status.get('account'),
+            variant: 'simple'
+          }}
+          className='status__display-name muted'
+        />
+      )
 
       prepend = (
         <div className='status__prepend'>
           <div className='status__prepend__icon'><Icon id='retweet' icon={RepeatIcon} /></div>
-          <FormattedMessage id='status.reblogged_by' defaultMessage='{name} boosted' values={{ name: <Link data-id={status.getIn(['account', 'id'])} data-hover-card-account={status.getIn(['account', 'id'])} to={`/@${status.getIn(['account', 'acct'])}`} className='status__display-name muted'><bdi><strong dangerouslySetInnerHTML={display_name_html} /></bdi></Link> }} />
+          <FormattedMessage id='status.reblogged_by' defaultMessage='{name} boosted' values={{ name }} />
         </div>
       );
 
@@ -570,13 +578,11 @@ class Status extends ImmutablePureComponent {
                 <RelativeTimestamp timestamp={status.get('created_at')} />{status.get('edited_at') && <abbr title={intl.formatMessage(messages.edited, { date: intl.formatDate(status.get('edited_at'), { year: 'numeric', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) })}> *</abbr>}
               </Link>
 
-              <Link to={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} data-hover-card-account={status.getIn(['account', 'id'])} className='status__display-name'>
+              <LinkedDisplayName displayProps={{account: status.get('account')}} className='status__display-name'>
                 <div className='status__avatar'>
                   {statusAvatar}
                 </div>
-
+              </LinkedDisplayName>
-                <DisplayName account={status.get('account')} />
-              </Link>
 
               {isQuotedPost && !!this.props.onQuoteCancel &&  (
                 <IconButton

app/javascript/mastodon/components/status_thread_label.tsx

@@ -2,9 +2,10 @@ import { FormattedMessage } from 'react-intl';
 
 import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
 import { Icon } from 'mastodon/components/icon';
-import { DisplayedName } from 'mastodon/features/notifications_v2/components/displayed_name';
 import { useAppSelector } from 'mastodon/store';
 
+import { LinkedDisplayName } from './display_name';
+
 export const StatusThreadLabel: React.FC<{
   accountId: string;
   inReplyToAccountId: string;
@@ -27,7 +28,13 @@ export const StatusThreadLabel: React.FC<{
       <FormattedMessage
         id='status.replied_to'
         defaultMessage='Replied to {name}'
-        values={{ name: <DisplayedName accountIds={[inReplyToAccountId]} /> }}
+        values={{
+          name: (
+            <LinkedDisplayName
+              displayProps={{ account: inReplyToAccount, variant: 'simple' }}
+            />
+          ),
+        }}
       />
     );
   } else {

app/javascript/mastodon/features/account/components/follow_request_note.jsx

@@ -6,6 +6,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import CheckIcon from '@/material-icons/400-24px/check.svg?react';
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { Icon }  from 'mastodon/components/icon';
+import { DisplayName } from '@/mastodon/components/display_name';
 
 export default class FollowRequestNote extends ImmutablePureComponent {
 
@@ -19,7 +20,7 @@ export default class FollowRequestNote extends ImmutablePureComponent {
     return (
       <div className='follow-request-banner'>
         <div className='follow-request-banner__message'>
-          <FormattedMessage id='account.requested_follow' defaultMessage='{name} has requested to follow you' values={{ name: <bdi><strong dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }} /></bdi> }} />
+          <FormattedMessage id='account.requested_follow' defaultMessage='{name} has requested to follow you' values={{ name: <DisplayName account={account} variant='simple' /> }} />
         </div>
 
         <div className='follow-request-banner__action'>

app/javascript/mastodon/features/account_timeline/components/account_header.tsx

@@ -7,6 +7,7 @@ import { Helmet } from 'react-helmet';
 import { NavLink } from 'react-router-dom';
 
 import { AccountBio } from '@/mastodon/components/account_bio';
+import { DisplayName } from '@/mastodon/components/display_name';
 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,7 +775,6 @@ export const AccountHeader: React.FC<{
     );
   }
 
-  const displayNameHtml = { __html: account.display_name_html };
   const fields = account.fields;
   const isLocal = !account.acct.includes('@');
   const username = account.acct.split('@')[0];
@@ -863,7 +863,7 @@ export const AccountHeader: React.FC<{
 
           <div className='account__header__tabs__name'>
             <h1>
-              <span dangerouslySetInnerHTML={displayNameHtml} />
+              <DisplayName account={account} variant='simple' />
               <small>
                 <span>
                   @{username}

app/javascript/mastodon/features/account_timeline/components/familiar_followers.tsx

@@ -1,33 +1,26 @@
 import { FormattedMessage } from 'react-intl';
 
-import { Link } from 'react-router-dom';
-
 import { Avatar } from '@/mastodon/components/avatar';
 import { AvatarGroup } from '@/mastodon/components/avatar_group';
+import { LinkedDisplayName } from '@/mastodon/components/display_name';
 import type { Account } from '@/mastodon/models/account';
 
 import { useFetchFamiliarFollowers } from '../hooks/familiar_followers';
 
-const AccountLink: React.FC<{ account?: Account }> = ({ account }) => {
-  if (!account) {
-    return null;
-  }
-
-  return (
-    <Link
-      to={`/@${account.acct}`}
-      data-hover-card-account={account.id}
-      dangerouslySetInnerHTML={{ __html: account.display_name_html }}
-    />
-  );
-};
-
 const FamiliarFollowersReadout: React.FC<{ familiarFollowers: Account[] }> = ({
   familiarFollowers,
 }) => {
   const messageData = {
-    name1: <AccountLink account={familiarFollowers.at(0)} />,
+    name1: (
-    name2: <AccountLink account={familiarFollowers.at(1)} />,
+      <LinkedDisplayName
+        displayProps={{ account: familiarFollowers.at(0), variant: 'simple' }}
+      />
+    ),
+    name2: (
+      <LinkedDisplayName
+        displayProps={{ account: familiarFollowers.at(1), variant: 'simple' }}
+      />
+    ),
     othersCount: familiarFollowers.length - 2,
   };
 

app/javascript/mastodon/features/account_timeline/components/moved_note.tsx

@@ -2,8 +2,8 @@ import { FormattedMessage } from 'react-intl';
 
 import { Link } from 'react-router-dom';
 
+import { DisplayName } from '@/mastodon/components/display_name';
 import { AvatarOverlay } from 'mastodon/components/avatar_overlay';
-import { DisplayName } from 'mastodon/components/display_name';
 import { useAppSelector } from 'mastodon/store';
 
 export const MovedNote: React.FC<{
@@ -20,15 +20,7 @@ export const MovedNote: React.FC<{
           id='account.moved_to'
           defaultMessage='{name} has indicated that their new account is now:'
           values={{
-            name: (
+            name: <DisplayName account={from} variant='simple' />,
-              <bdi>
-                <strong
-                  dangerouslySetInnerHTML={{
-                    __html: from?.display_name_html ?? '',
-                  }}
-                />
-              </bdi>
-            ),
           }}
         />
       </div>

app/javascript/mastodon/features/annual_report/highlighted_post.tsx

@@ -6,6 +6,7 @@ import { useCallback } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
+import { DisplayName } from '@/mastodon/components/display_name';
 import { toggleStatusSpoilers } from 'mastodon/actions/statuses';
 import { DetailedStatus } from 'mastodon/features/status/components/detailed_status';
 import { me } from 'mastodon/initial_state';
@@ -79,11 +80,7 @@ export const HighlightedPost: React.FC<{
           id='annual_report.summary.highlighted_post.possessive'
           defaultMessage="{name}'s"
           values={{
-            name: account && (
+            name: <DisplayName account={account} variant='simple' />,
-              <bdi
-                dangerouslySetInnerHTML={{ __html: account.display_name_html }}
-              />
-            ),
           }}
         />
       </strong>

app/javascript/mastodon/features/direct_timeline/components/conversation.jsx

@@ -25,6 +25,7 @@ import StatusContent from 'mastodon/components/status_content';
 import { Dropdown } from 'mastodon/components/dropdown_menu';
 import { autoPlayGif } from 'mastodon/initial_state';
 import { makeGetStatus } from 'mastodon/selectors';
+import { LinkedDisplayName } from '@/mastodon/components/display_name';
 
 const messages = defineMessages({
   more: { id: 'status.more', defaultMessage: 'More' },
@@ -139,15 +140,8 @@ export const Conversation = ({ conversation, scrollKey }) => {
 
   menu.push({ text: intl.formatMessage(messages.delete), action: handleDelete });
 
-  const names = accounts.map(a => (
+  const names = accounts.map((account) => (
-    <Link to={`/@${a.get('acct')}`} key={a.get('id')} data-hover-card-account={a.get('id')}>
+    <LinkedDisplayName displayProps={{account, variant: 'simple'}} key={account.get('id')} />
-      <bdi>
-        <strong
-          className='display-name__html'
-          dangerouslySetInnerHTML={{ __html: a.get('display_name_html') }}
-        />
-      </bdi>
-    </Link>
   )).reduce((prev, cur) => [prev, ', ', cur]);
 
   const handlers = {

app/javascript/mastodon/features/explore/components/author_link.jsx

@@ -1,9 +1,8 @@
 import PropTypes from 'prop-types';
 
-import { Link } from 'react-router-dom';
-
 import { Avatar } from 'mastodon/components/avatar';
 import { useAppSelector } from 'mastodon/store';
+import { LinkedDisplayName } from '@/mastodon/components/display_name';
 
 export const AuthorLink = ({ accountId }) => {
   const account = useAppSelector(state => state.getIn(['accounts', accountId]));
@@ -13,10 +12,9 @@ export const AuthorLink = ({ accountId }) => {
   }
 
   return (
-    <Link to={`/@${account.get('acct')}`} className='story__details__shared__author-link' data-hover-card-account={accountId}>
+    <LinkedDisplayName displayProps={{account}} className='story__details__shared__author-link'>
       <Avatar account={account} size={16} />
-      <bdi dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }} />
+    </LinkedDisplayName>
-    </Link>
   );
 };
 

app/javascript/mastodon/features/interaction_modal/index.tsx

@@ -7,6 +7,7 @@ import classNames from 'classnames';
 import { escapeRegExp } from 'lodash';
 import { useDebouncedCallback } from 'use-debounce';
 
+import { DisplayName } from '@/mastodon/components/display_name';
 import { openModal, closeModal } from 'mastodon/actions/modal';
 import { apiRequest } from 'mastodon/api';
 import { Button } from 'mastodon/components/button';
@@ -404,15 +405,13 @@ const InteractionModal: React.FC<{
   url: string;
 }> = ({ accountId, url }) => {
   const dispatch = useAppDispatch();
-  const displayNameHtml = useAppSelector(
-    (state) => state.accounts.get(accountId)?.display_name_html ?? '',
-  );
   const signupUrl = useAppSelector(
     (state) =>
       (state.server.getIn(['server', 'registrations', 'url'], null) ||
         '/auth/sign_up') as string,
   );
-  const name = <bdi dangerouslySetInnerHTML={{ __html: displayNameHtml }} />;
+  const account = useAppSelector((state) => state.accounts.get(accountId));
+  const name = <DisplayName account={account} variant='simple' />;
 
   const handleSignupClick = useCallback(() => {
     dispatch(

app/javascript/mastodon/features/notifications/components/notification.jsx

@@ -18,6 +18,7 @@ import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
 import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
 import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
 import { Account } from 'mastodon/components/account';
+import { LinkedDisplayName } from '@/mastodon/components/display_name';
 import { Icon }  from 'mastodon/components/icon';
 import { Hotkeys } from 'mastodon/components/hotkeys';
 import { StatusQuoteManager } from 'mastodon/components/status_quoted';
@@ -485,8 +486,10 @@ class Notification extends ImmutablePureComponent {
     }
 
     const targetAccount = report.get('target_account');
-    const targetDisplayNameHtml = { __html: targetAccount.get('display_name_html') };
+    const targetLink = <LinkedDisplayName
-    const targetLink = <bdi><Link className='notification__display-name' title={targetAccount.get('acct')} data-hover-card-account={targetAccount.get('id')} to={`/@${targetAccount.get('acct')}`} dangerouslySetInnerHTML={targetDisplayNameHtml} /></bdi>;
+      className='notification__display-name'
+      displayProps={{account:targetAccount, variant: 'simple'}}
+    />;
 
     return (
       <Hotkeys handlers={this.getHandlers()}>
@@ -508,8 +511,7 @@ class Notification extends ImmutablePureComponent {
   render () {
     const { notification } = this.props;
     const account          = notification.get('account');
-    const displayNameHtml  = { __html: account.get('display_name_html') };
+    const link             = <LinkedDisplayName className='notification__display-name' displayProps={{account, variant: 'simple'}} />;
-    const link             = <bdi><Link className='notification__display-name' href={`/@${account.get('acct')}`} title={account.get('acct')} data-hover-card-account={account.get('id')} to={`/@${account.get('acct')}`} dangerouslySetInnerHTML={displayNameHtml} /></bdi>;
 
     switch(notification.get('type')) {
     case 'follow':

app/javascript/mastodon/features/notifications/components/notification_request.jsx

@@ -16,6 +16,7 @@ import { acceptNotificationRequest, dismissNotificationRequest } from 'mastodon/
 import { initReport } from 'mastodon/actions/reports';
 import { Avatar } from 'mastodon/components/avatar';
 import { CheckBox } from 'mastodon/components/check_box';
+import { DisplayName } from '@/mastodon/components/display_name';
 import { IconButton } from 'mastodon/components/icon_button';
 import { Dropdown } from 'mastodon/components/dropdown_menu';
 import { makeGetAccount } from 'mastodon/selectors';
@@ -96,7 +97,7 @@ export const NotificationRequest = ({ id, accountId, notificationsCount, checked
 
         <div className='notification-request__name'>
           <div className='notification-request__name__display-name'>
-            <bdi><strong dangerouslySetInnerHTML={{ __html: account?.get('display_name_html') }} /></bdi>
+            <DisplayName account={account} variant='simple' />
           </div>
 
           <span>@{account?.get('acct')}</span>

app/javascript/mastodon/features/notifications_v2/components/displayed_name.tsx

@@ -1,22 +0,0 @@
-import { Link } from 'react-router-dom';
-
-import { useAppSelector } from 'mastodon/store';
-
-export const DisplayedName: React.FC<{
-  accountIds: string[];
-}> = ({ accountIds }) => {
-  const lastAccountId = accountIds[0] ?? '0';
-  const account = useAppSelector((state) => state.accounts.get(lastAccountId));
-
-  if (!account) return null;
-
-  return (
-    <Link
-      to={`/@${account.acct}`}
-      title={`@${account.acct}`}
-      data-hover-card-account={account.id}
-    >
-      <bdi dangerouslySetInnerHTML={{ __html: account.display_name_html }} />
-    </Link>
-  );
-};

app/javascript/mastodon/features/notifications_v2/components/notification_admin_report.tsx

@@ -2,6 +2,7 @@ import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
 
 import classNames from 'classnames';
 
+import { DisplayName } from '@/mastodon/components/display_name';
 import FlagIcon from '@/material-icons/400-24px/flag-fill.svg?react';
 import { Icon } from 'mastodon/components/icon';
 import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
@@ -42,11 +43,9 @@ export const NotificationAdminReport: React.FC<{
 
   if (!account || !targetAccount) return null;
 
-  const domain = account.acct.split('@')[1];
-
   const values = {
-    name: <bdi>{domain ?? `@${account.acct}`}</bdi>,
+    name: <DisplayName account={account} variant='simple' />,
-    target: <bdi>@{targetAccount.acct}</bdi>,
+    target: <DisplayName account={targetAccount} variant='simple' />,
     category: intl.formatMessage(messages[report.category]),
     count: report.status_ids.length,
   };

app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx

@@ -3,6 +3,7 @@ import type { JSX } from 'react';
 
 import classNames from 'classnames';
 
+import { LinkedDisplayName } from '@/mastodon/components/display_name';
 import { replyComposeById } from 'mastodon/actions/compose';
 import { navigateToStatus } from 'mastodon/actions/statuses';
 import { Avatar } from 'mastodon/components/avatar';
@@ -14,7 +15,6 @@ import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
 import { NOTIFICATIONS_GROUP_MAX_AVATARS } from 'mastodon/models/notification_group';
 import { useAppSelector, useAppDispatch } from 'mastodon/store';
 
-import { DisplayedName } from './displayed_name';
 import { EmbeddedStatus } from './embedded_status';
 
 const AVATAR_SIZE = 28;
@@ -61,15 +61,18 @@ export const NotificationGroupWithStatus: React.FC<{
   additionalContent,
 }) => {
   const dispatch = useAppDispatch();
+  const account = useAppSelector((state) =>
+    state.accounts.get(accountIds.at(0) ?? ''),
+  );
 
   const label = useMemo(
     () =>
       labelRenderer(
-        <DisplayedName accountIds={accountIds} />,
+        <LinkedDisplayName displayProps={{ account, variant: 'simple' }} />,
         count,
         labelSeeMoreHref,
       ),
-    [labelRenderer, accountIds, count, labelSeeMoreHref],
+    [labelRenderer, account, count, labelSeeMoreHref],
   );
 
   const isPrivateMention = useAppSelector(

app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx

@@ -2,6 +2,7 @@ import { useMemo } from 'react';
 
 import classNames from 'classnames';
 
+import { LinkedDisplayName } from '@/mastodon/components/display_name';
 import { replyComposeById } from 'mastodon/actions/compose';
 import { toggleReblog, toggleFavourite } from 'mastodon/actions/interactions';
 import {
@@ -15,7 +16,6 @@ import { StatusQuoteManager } from 'mastodon/components/status_quoted';
 import { getStatusHidden } from 'mastodon/selectors/filters';
 import { useAppSelector, useAppDispatch } from 'mastodon/store';
 
-import { DisplayedName } from './displayed_name';
 import type { LabelRenderer } from './notification_group_with_status';
 
 export const NotificationWithStatus: React.FC<{
@@ -39,9 +39,16 @@ export const NotificationWithStatus: React.FC<{
 }) => {
   const dispatch = useAppDispatch();
 
+  const account = useAppSelector((state) =>
+    state.accounts.get(accountIds.at(0) ?? ''),
+  );
   const label = useMemo(
-    () => labelRenderer(<DisplayedName accountIds={accountIds} />, count),
+    () =>
-    [labelRenderer, accountIds, count],
+      labelRenderer(
+        <LinkedDisplayName displayProps={{ account, variant: 'simple' }} />,
+        count,
+      ),
+    [labelRenderer, account, count],
   );
 
   const isPrivateMention = useAppSelector(

app/javascript/mastodon/locales/ar.json

@@ -849,7 +849,6 @@
   "status.block": "احجب @{name}",
   "status.bookmark": "أضفه إلى الفواصل المرجعية",
   "status.cancel_reblog_private": "إلغاء إعادة النشر",
-  "status.cannot_quote": "الاقتباسات معطلة على هذا المنشور",
   "status.cannot_reblog": "لا يمكن إعادة نشر هذا المنشور",
   "status.context.load_new_replies": "الردود الجديدة المتاحة",
   "status.context.loading": "التحقق من المزيد من الردود",

app/javascript/mastodon/locales/be.json

@@ -453,10 +453,12 @@
   "ignore_notifications_modal.private_mentions_title": "Ігнараваць апавяшчэнні пра непажаданыя прыватныя згадванні?",
   "info_button.label": "Даведка",
   "info_button.what_is_alt_text": "<h1>Што такое альтэрнатыўны тэкст?</h1> <p>Альтэрнатыўны тэкст апісвае відарыс людзям з парушэннем зроку, павольным злучэннем або тым, каму патрэбны дадатковы кантэкст.</p> <p>Вы можаце зрабіць відарыс больш дасяжным і зразумелым для ўсіх, напісаўшы зразумелы, сціслы і аб'ектыўны альтэрнатыўны тэкст.</p> <ul><li>Ахоплівайце важныя элементы</li> <li>Тлумачце тэкст на відарысе</li> <li>Карыстайцеся звычайнымі сказамі</li> <li>Пазбягайце залішняй інфармацыі</li> <li>Засяроджвайцеся на тэндэнцыях і ключавых высновах у цяжкіх для разумення візуальных матэрыялах (напрыклад, дыяграмах або картах)</li></ul>",
+  "interaction_modal.action": "Каб узаемадзейнічаць з допісам {name}, Вам трэба ўвайсці ў свой уліковы запіс на любым серверы Mastodon, якім Вы карыстаецеся.",
   "interaction_modal.go": "Перайсці",
   "interaction_modal.no_account_yet": "Не маеце ўліковага запісу?",
   "interaction_modal.on_another_server": "На іншым серверы",
   "interaction_modal.on_this_server": "На гэтым серверы",
+  "interaction_modal.title": "Увайдзіце, каб працягнуць",
   "interaction_modal.username_prompt": "Напр., {example}",
   "intervals.full.days": "{number, plural, one {# дзень} few {# дні} many {# дзён} other {# дня}}",
   "intervals.full.hours": "{number, plural, one {# гадзіна} few {# гадзіны} many {# гадзін} other {# гадзіны}}",
@@ -860,7 +862,7 @@
   "status.block": "Заблакіраваць @{name}",
   "status.bookmark": "Дадаць закладку",
   "status.cancel_reblog_private": "Прыбраць",
-  "status.cannot_quote": "Цытаванне адключанае для гэтага допісу",
+  "status.cannot_quote": "Вы не маеце дазвол цытаваць гэты допіс",
   "status.cannot_reblog": "Гэты допіс нельга пашырыць",
   "status.context.load_new_replies": "Даступныя новыя адказы",
   "status.context.loading": "Правяраюцца новыя адказы",

app/javascript/mastodon/locales/br.json

@@ -652,7 +652,6 @@
   "status.block": "Stankañ @{name}",
   "status.bookmark": "Ouzhpennañ d'ar sinedoù",
   "status.cancel_reblog_private": "Nac'hañ ar skignadenn",
-  "status.cannot_quote": "N'haller ket menegiñ an embannadur-mañ",
   "status.cannot_reblog": "Ar c'hannad-se na c'hall ket bezañ skignet",
   "status.context.load_new_replies": "Respontoù nevez zo",
   "status.context.loading": "O kerc'hat muioc'h a respontoù",

app/javascript/mastodon/locales/cs.json

@@ -453,10 +453,12 @@
   "ignore_notifications_modal.private_mentions_title": "Ignorovat oznámení z nevyžádaných soukromých zmínek?",
   "info_button.label": "Nápověda",
   "info_button.what_is_alt_text": "<h1>Co je to alt text?</h1> <p>Alt text poskytuje popis obrázků pro lidi se zrakovými postižením, špatným připojením něbo těm, kteří potřebují více kontextu.</p> <p>Můžete zlepšit přístupnost a porozumění napsáním jasného, stručného a objektivního alt textu.</p> <ul> <li>Zachyťte důležité prvky</li> <li>Shrňte text v obrázku</li> <li>Použijte pravidelnou větnou skladbu</li> <li>Vyhněte se nadbytečným informacím</li> <li>U komplexních vizualizací (diagramy, mapy...) se zaměřte na trendy a klíčová zjištění</li> </ul>",
+  "interaction_modal.action": "Chcete-li interagovat s příspěvkem {name}, budete se muset přihlásit do vašeho účtu na Mastodon serveru, který používáte.",
   "interaction_modal.go": "Přejít",
   "interaction_modal.no_account_yet": "Ještě nemáte účet?",
   "interaction_modal.on_another_server": "Na jiném serveru",
   "interaction_modal.on_this_server": "Na tomto serveru",
+  "interaction_modal.title": "Chcete-li pokračovat, přihlaste se",
   "interaction_modal.username_prompt": "např. {example}",
   "intervals.full.days": "{number, plural, one {# den} few {# dny} many {# dní} other {# dní}}",
   "intervals.full.hours": "{number, plural, one {# hodina} few {# hodiny} many {# hodin} other {# hodin}}",
@@ -860,7 +862,7 @@
   "status.block": "Blokovat @{name}",
   "status.bookmark": "Přidat do záložek",
   "status.cancel_reblog_private": "Zrušit boostnutí",
-  "status.cannot_quote": "Citování je na tomo příspěvku zakázáno",
+  "status.cannot_quote": "Nemáte oprávnění citovat tento příspěvek",
   "status.cannot_reblog": "Tento příspěvek nemůže být boostnutý",
   "status.context.load_new_replies": "K dispozici jsou nové odpovědi",
   "status.context.loading": "Hledání dalších odpovědí",

app/javascript/mastodon/locales/cy.json

@@ -860,7 +860,6 @@
   "status.block": "Rhwystro @{name}",
   "status.bookmark": "Nod tudalen",
   "status.cancel_reblog_private": "Dadhybu",
-  "status.cannot_quote": "Mae dyfyniadau wedi'u hanalluogi ar y postiad hwn",
   "status.cannot_reblog": "Does dim modd hybu'r postiad hwn",
   "status.context.load_new_replies": "Mae atebion newydd ar gael",
   "status.context.loading": "Yn chwilio am fwy o atebion",

app/javascript/mastodon/locales/da.json

@@ -862,7 +862,7 @@
   "status.block": "Blokér @{name}",
   "status.bookmark": "Bogmærk",
   "status.cancel_reblog_private": "Fjern fremhævelse",
-  "status.cannot_quote": "Citater er deaktiveret på dette indlæg",
+  "status.cannot_quote": "Du har ikke tilladelse til at citere dette indlæg",
   "status.cannot_reblog": "Dette indlæg kan ikke fremhæves",
   "status.context.load_new_replies": "Nye svar tilgængelige",
   "status.context.loading": "Tjekker for flere svar",

app/javascript/mastodon/locales/de.json

@@ -862,7 +862,7 @@
   "status.block": "@{name} blockieren",
   "status.bookmark": "Lesezeichen setzen",
   "status.cancel_reblog_private": "Beitrag nicht mehr teilen",
-  "status.cannot_quote": "Zitieren dieses Beitrags ist deaktiviert",
+  "status.cannot_quote": "Dir ist es nicht gestattet, diesen Beitrag zu zitieren",
   "status.cannot_reblog": "Dieser Beitrag kann nicht geteilt werden",
   "status.context.load_new_replies": "Neue Antworten verfügbar",
   "status.context.loading": "Weitere Antworten werden abgerufen",

app/javascript/mastodon/locales/el.json

@@ -860,7 +860,6 @@
   "status.block": "Αποκλεισμός @{name}",
   "status.bookmark": "Σελιδοδείκτης",
   "status.cancel_reblog_private": "Ακύρωση ενίσχυσης",
-  "status.cannot_quote": "Οι παραθέσεις είναι ανενεργές σ' αυτήν την ανάρτηση",
   "status.cannot_reblog": "Αυτή η ανάρτηση δεν μπορεί να ενισχυθεί",
   "status.context.load_new_replies": "Νέες απαντήσεις διαθέσιμες",
   "status.context.loading": "Γίνεται έλεγχος για περισσότερες απαντήσεις",

app/javascript/mastodon/locales/eo.json

@@ -842,7 +842,6 @@
   "status.block": "Bloki @{name}",
   "status.bookmark": "Aldoni al la legosignoj",
   "status.cancel_reblog_private": "Ne plu diskonigi",
-  "status.cannot_quote": "Citaĵoj estas malebligitaj en ĉi tiu afiŝo",
   "status.cannot_reblog": "Ĉi tiun afiŝon ne eblas diskonigi",
   "status.context.load_new_replies": "Disponeblaj novaj respondoj",
   "status.context.loading": "Serĉante pliajn respondojn",

app/javascript/mastodon/locales/es-AR.json

@@ -862,7 +862,7 @@
   "status.block": "Bloquear a @{name}",
   "status.bookmark": "Marcar",
   "status.cancel_reblog_private": "Quitar adhesión",
-  "status.cannot_quote": "Las citas están deshabilitadas en este mensaje",
+  "status.cannot_quote": "No te es permitido citar este mensaje",
   "status.cannot_reblog": "No se puede adherir a este mensaje",
   "status.context.load_new_replies": "Hay nuevas respuestas",
   "status.context.loading": "Buscando más respuestas",

app/javascript/mastodon/locales/es-MX.json

@@ -862,7 +862,7 @@
   "status.block": "Bloquear a @{name}",
   "status.bookmark": "Añadir marcador",
   "status.cancel_reblog_private": "Deshacer impulso",
-  "status.cannot_quote": "Las citas están desactivadas en esta publicación",
+  "status.cannot_quote": "No está permitido citar esta publicación",
   "status.cannot_reblog": "Esta publicación no puede ser impulsada",
   "status.context.load_new_replies": "Nuevas respuestas disponibles",
   "status.context.loading": "Comprobando si hay más respuestas",

app/javascript/mastodon/locales/es.json

@@ -862,7 +862,7 @@
   "status.block": "Bloquear a @{name}",
   "status.bookmark": "Añadir marcador",
   "status.cancel_reblog_private": "Deshacer impulso",
-  "status.cannot_quote": "Las citas están desactivadas en esta publicación",
+  "status.cannot_quote": "No está permitido citar esta publicación",
   "status.cannot_reblog": "Esta publicación no se puede impulsar",
   "status.context.load_new_replies": "Hay nuevas respuestas",
   "status.context.loading": "Buscando más respuestas",

app/javascript/mastodon/locales/et.json

@@ -860,7 +860,6 @@
   "status.block": "Blokeeri @{name}",
   "status.bookmark": "Järjehoidja",
   "status.cancel_reblog_private": "Lõpeta jagamine",
-  "status.cannot_quote": "Selle postituse tsiteerimine pole lubatud",
   "status.cannot_reblog": "Seda postitust ei saa jagada",
   "status.context.load_new_replies": "Leidub uusi vastuseid",
   "status.context.loading": "Kontrollin täiendavate vastuste olemasolu",

app/javascript/mastodon/locales/fa.json

@@ -841,7 +841,6 @@
   "status.block": "انسداد ‎@{name}",
   "status.bookmark": "نشانک",
   "status.cancel_reblog_private": "ناتقویت",
-  "status.cannot_quote": "نقل قول برای این پست غیرفعال است",
   "status.cannot_reblog": "این فرسته قابل تقویت نیست",
   "status.context.load_new_replies": "پاسخ‌های جدیدی موجودند",
   "status.context.loading": "بررسی کردن برای پاسخ‌های بیش‌تر",

app/javascript/mastodon/locales/fi.json

@@ -862,7 +862,7 @@
   "status.block": "Estä @{name}",
   "status.bookmark": "Lisää kirjanmerkki",
   "status.cancel_reblog_private": "Peru tehostus",
-  "status.cannot_quote": "Tämän julkaisun lainaus on poistettu käytöstä",
+  "status.cannot_quote": "Sinulla ei ole oikeutta lainata tätä julkaisua",
   "status.cannot_reblog": "Tätä julkaisua ei voi tehostaa",
   "status.context.load_new_replies": "Uusia vastauksia saatavilla",
   "status.context.loading": "Tarkistetaan lisävastauksia",

app/javascript/mastodon/locales/fo.json

@@ -862,7 +862,7 @@
   "status.block": "Blokera @{name}",
   "status.bookmark": "Goym",
   "status.cancel_reblog_private": "Strika stimbran",
-  "status.cannot_quote": "Tað er ikki loyvt at sitera hendan postin",
+  "status.cannot_quote": "Tú hevur ikki loyvi at sitera hendan postin",
   "status.cannot_reblog": "Tað ber ikki til at stimbra hendan postin",
   "status.context.load_new_replies": "Nýggj svar tøk",
   "status.context.loading": "Kanni um tað eru fleiri svar",

app/javascript/mastodon/locales/fr-CA.json

@@ -846,7 +846,6 @@
   "status.block": "Bloquer @{name}",
   "status.bookmark": "Ajouter aux signets",
   "status.cancel_reblog_private": "Débooster",
-  "status.cannot_quote": "Les citations sont désactivées sur cette publication",
   "status.cannot_reblog": "Cette publication ne peut pas être boostée",
   "status.context.load_new_replies": "Nouvelles réponses disponibles",
   "status.continued_thread": "Suite du fil",

app/javascript/mastodon/locales/fr.json

@@ -846,7 +846,6 @@
   "status.block": "Bloquer @{name}",
   "status.bookmark": "Ajouter aux marque-pages",
   "status.cancel_reblog_private": "Annuler le partage",
-  "status.cannot_quote": "Les citations sont désactivées sur cette publication",
   "status.cannot_reblog": "Ce message ne peut pas être partagé",
   "status.context.load_new_replies": "Nouvelles réponses disponibles",
   "status.continued_thread": "Suite du fil",

app/javascript/mastodon/locales/ga.json

@@ -453,10 +453,12 @@
   "ignore_notifications_modal.private_mentions_title": "An dtugann tú aird ar fhógraí ó Luaintí Príobháideacha gan iarraidh?",
   "info_button.label": "Cabhrú",
   "info_button.what_is_alt_text": "<h1>Cad is téacs altach ann?</h1> <p>Soláthraíonn téacs Alt cur síos ar íomhánna do dhaoine le lagú radhairc, naisc íseal-bandaleithead, nó daoine atá ag lorg comhthéacs breise.</p> <p>Is féidir leat inrochtaineacht agus tuiscint a fheabhsú do chách trí théacs alt soiléir, gonta, oibiachtúil a scríobh.</p> <ul> <li>Glac gnéithe tábhachtacha</li> <li>Déan achoimre ar théacs in íomhánna</li> <li>Úsáid struchtúr abairtí rialta</li> li> <li>Seachain faisnéis iomarcach</li> <li>Fócas ar threochtaí agus ar phríomhthorthaí i bhfíseanna casta (amhail léaráidí nó léarscáileanna)</li> </ul>",
+  "interaction_modal.action": "Chun idirghníomhú le post {name}, ní mór duit síniú isteach i do chuntas ar cibé freastalaí Mastodon a úsáideann tú.",
   "interaction_modal.go": "Téigh",
   "interaction_modal.no_account_yet": "Níl cuntas agat fós?",
   "interaction_modal.on_another_server": "Ar freastalaí eile",
   "interaction_modal.on_this_server": "Ar an freastalaí seo",
+  "interaction_modal.title": "Sínigh isteach le leanúint ar aghaidh",
   "interaction_modal.username_prompt": "M.sh. {example}",
   "intervals.full.days": "{number, plural, one {# lá} other {# lá}}",
   "intervals.full.hours": "{number, plural, one {# uair} other {# uair}}",
@@ -860,7 +862,6 @@
   "status.block": "Bac @{name}",
   "status.bookmark": "Leabharmharcanna",
   "status.cancel_reblog_private": "Dímhol",
-  "status.cannot_quote": "Tá luachana díchumasaithe ar an bpost seo",
   "status.cannot_reblog": "Ní féidir an phostáil seo a mholadh",
   "status.context.load_new_replies": "Freagraí nua ar fáil",
   "status.context.loading": "Ag seiceáil le haghaidh tuilleadh freagraí",

app/javascript/mastodon/locales/gd.json

@@ -239,6 +239,8 @@
   "confirmations.missing_alt_text.secondary": "Postaich e co-dhiù",
   "confirmations.missing_alt_text.title": "A bheil thu airson roghainn teacsa a chur ris?",
   "confirmations.mute.confirm": "Mùch",
+  "confirmations.quiet_post_quote_info.dismiss": "Na cuiribh seo ’nam chuimhne a-rithist",
+  "confirmations.quiet_post_quote_info.got_it": "Tha mi agaibh",
   "confirmations.redraft.confirm": "Sguab às ⁊ dèan dreachd ùr",
   "confirmations.redraft.message": "A bheil thu cinnteach gu bheil thu airson am post seo a sguabadh às agus dreachd ùr a thòiseachadh? Caillidh tu gach annsachd is brosnachadh air agus thèid freagairtean dhan phost thùsail ’nan dìlleachdanan.",
   "confirmations.redraft.title": "A bheil thu airson am post a sguabadh às ⁊ dreachd ùr a dhèanamh dheth?",
@@ -477,6 +479,7 @@
   "keyboard_shortcuts.open_media": "Fosgail meadhan",
   "keyboard_shortcuts.pinned": "Fosgail liosta nam postaichean prìnichte",
   "keyboard_shortcuts.profile": "Fosgail pròifil an ùghdair",
+  "keyboard_shortcuts.quote": "Luaidh am post",
   "keyboard_shortcuts.reply": "Freagair do phost",
   "keyboard_shortcuts.requests": "Fosgail liosta nan iarrtasan leantainn",
   "keyboard_shortcuts.search": "Cuir am fòcas air a’ bhàr-luirg",
@@ -588,6 +591,7 @@
   "notification.label.mention": "Iomradh",
   "notification.label.private_mention": "Iomradh prìobhaideach",
   "notification.label.private_reply": "Freagairt phrìobhaideach",
+  "notification.label.quote": "Luaidh {name} am post agad",
   "notification.label.reply": "Freagairt",
   "notification.mention": "Iomradh",
   "notification.mentioned_you": "Thug {name} iomradh ort",
@@ -602,6 +606,7 @@
   "notification.moderation_warning.action_suspend": "Chaidh an cunntas agad a chur à rèim.",
   "notification.own_poll": "Thàinig an cunntas-bheachd agad gu crìoch",
   "notification.poll": "Thàinig cunntas-bheachd sa bhòt thu gu crìoch",
+  "notification.quoted_update": "Dheasaich {name} post a luaidh thu",
   "notification.reblog": "Bhrosnaich {name} am post agad",
   "notification.reblog.name_and_others_with_link": "Bhrosnaich {name} ’s <a>{count, plural, one {# eile} two {# eile} few {# eile} other {# eile}}</a> am post agad",
   "notification.relationships_severance_event": "Chaill thu dàimhean le {name}",
@@ -645,6 +650,7 @@
   "notifications.column_settings.mention": "Iomraidhean:",
   "notifications.column_settings.poll": "Toraidhean cunntais-bheachd:",
   "notifications.column_settings.push": "Brathan putaidh",
+  "notifications.column_settings.quote": "Luaidhean:",
   "notifications.column_settings.reblog": "Brosnachaidhean:",
   "notifications.column_settings.show": "Seall sa cholbh",
   "notifications.column_settings.sound": "Cluich fuaim",
@@ -720,10 +726,15 @@
   "privacy.private.short": "Luchd-leantainn",
   "privacy.public.long": "Duine sam bith taobh a-staigh no a-muigh Mhastodon",
   "privacy.public.short": "Poblach",
+  "privacy.quote.anyone": "{visibility}, faodaidh neach sam bith a luaidh",
+  "privacy.quote.disabled": "{visibility}, luaidhean à comas",
+  "privacy.quote.limited": "{visibility}, luaidhean cuingichte",
   "privacy.unlisted.additional": "Tha seo coltach ris an fhaicsinneachd phoblach ach cha nochd am post air loidhnichean-ama an t-saoghail phoblaich, nan tagaichean hais no an rùrachaidh no ann an toraidhean luirg Mhastodon fiù ’s ma thug thu ro-aonta airson sin seachad.",
   "privacy.unlisted.short": "Poblach ach sàmhach",
   "privacy_policy.last_updated": "An t-ùrachadh mu dheireadh {date}",
   "privacy_policy.title": "Poileasaidh prìobhaideachd",
+  "quote_error.quote": "Chan eil taic ach ri aon luaidh aig an aon àm.",
+  "quote_error.unauthorized": "Chan fhaod thu am post seo a luaidh.",
   "recommended": "Molta",
   "refresh": "Ath-nuadhaich",
   "regeneration_indicator.please_stand_by": "Fuirich ort.",
@@ -830,9 +841,11 @@
   "status.admin_account": "Fosgail eadar-aghaidh na maorsainneachd dha @{name}",
   "status.admin_domain": "Fosgail eadar-aghaidh na maorsainneachd dha {domain}",
   "status.admin_status": "Fosgail am post seo ann an eadar-aghaidh na maorsainneachd",
+  "status.all_disabled": "Tha brosnachaidhean ’s luaidhean à comas",
   "status.block": "Bac @{name}",
   "status.bookmark": "Cuir ris na comharran-lìn",
   "status.cancel_reblog_private": "Na brosnaich tuilleadh",
+  "status.cannot_quote": "Chan fhaod thu am post seo a luaidh",
   "status.cannot_reblog": "Cha ghabh am post seo brosnachadh",
   "status.continued_thread": "Pàirt de shnàithlean",
   "status.copy": "Dèan lethbhreac dhen cheangal dhan phost",
@@ -859,6 +872,8 @@
   "status.mute_conversation": "Mùch an còmhradh",
   "status.open": "Leudaich am post seo",
   "status.pin": "Prìnich ris a’ phròifil",
+  "status.quote": "Luaidh",
+  "status.quote.cancel": "Sguir dhen luaidh",
   "status.quote_error.filtered": "Falaichte le criathrag a th’ agad",
   "status.read_more": "Leugh an còrr",
   "status.reblog": "Brosnaich",

app/javascript/mastodon/locales/gl.json

@@ -453,10 +453,12 @@
   "ignore_notifications_modal.private_mentions_title": "Ignorar notificacións de Mencións Privadas non solicitadas?",
   "info_button.label": "Axuda",
   "info_button.what_is_alt_text": "<h1>Que é o Texto Alternativo?</h1> <p>O Text Alt proporciona a descrición das imaxes para as persoas con deficiencias visuais, conexións a internet de baixa calidade ou para engadir contexto ás mesmas.</p> <p>Podes mellorar a accesibilidade e a comprensión da publicación ao escribir un texto alternativo claro, conciso e obxectivo.</p> <ul> <li>Identifica os elementos importantes</li> <li>Inclúe o texto que apareza nas imaxes</li> <li>Utiliza sintaxe estándar nas frases</li> <li>Evita información redundante</li> <li>Céntrate nos elementos principais cando sexan imaxes complexas (como diagramas ou mapas)</li> </ul>",
+  "interaction_modal.action": "Para interactuar coa publicación de {name} debes iniciar sesión no servidor Mastodon que utilices.",
   "interaction_modal.go": "Ir",
   "interaction_modal.no_account_yet": "Aínda non tes unha conta?",
   "interaction_modal.on_another_server": "Nun servidor diferente",
   "interaction_modal.on_this_server": "Neste servidor",
+  "interaction_modal.title": "Inicia sesión para continuar",
   "interaction_modal.username_prompt": "Ex. {example}",
   "intervals.full.days": "{number, plural,one {# día} other {# días}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
@@ -860,7 +862,6 @@
   "status.block": "Bloquear a @{name}",
   "status.bookmark": "Marcar",
   "status.cancel_reblog_private": "Desfacer compartido",
-  "status.cannot_quote": "Non se permite citar esta publicación",
   "status.cannot_reblog": "Esta publicación non pode ser promovida",
   "status.context.load_new_replies": "Non hai respostas dispoñibles",
   "status.context.loading": "Mirando se hai máis respostas",

app/javascript/mastodon/locales/he.json

@@ -860,7 +860,6 @@
   "status.block": "חסימת @{name}",
   "status.bookmark": "סימניה",
   "status.cancel_reblog_private": "הסרת הדהוד",
-  "status.cannot_quote": "ציטוטים של הודעה זו אינם מותרים",
   "status.cannot_reblog": "לא ניתן להדהד חצרוץ זה",
   "status.context.load_new_replies": "הגיעו תגובות חדשות",
   "status.context.loading": "מחפש תגובות חדשות",

app/javascript/mastodon/locales/hu.json

@@ -860,7 +860,6 @@
   "status.block": "@{name} letiltása",
   "status.bookmark": "Könyvjelzőzés",
   "status.cancel_reblog_private": "Megtolás visszavonása",
-  "status.cannot_quote": "Az idézés ki van kapcsolva ennél a bejegyzésnél",
   "status.cannot_reblog": "Ezt a bejegyzést nem lehet megtolni",
   "status.context.load_new_replies": "Új válaszok érhetőek el",
   "status.context.loading": "További válaszok keresése",

app/javascript/mastodon/locales/ia.json

@@ -860,7 +860,6 @@
   "status.block": "Blocar @{name}",
   "status.bookmark": "Adder al marcapaginas",
   "status.cancel_reblog_private": "Disfacer impulso",
-  "status.cannot_quote": "Le citationes es disactivate pro iste message",
   "status.cannot_reblog": "Iste message non pote esser impulsate",
   "status.context.load_new_replies": "Nove responsas disponibile",
   "status.context.loading": "Cercante plus responsas",

app/javascript/mastodon/locales/is.json

@@ -862,7 +862,7 @@
   "status.block": "Útiloka @{name}",
   "status.bookmark": "Bókamerki",
   "status.cancel_reblog_private": "Taka úr endurbirtingu",
-  "status.cannot_quote": "Tilvitnanir eru gerðar óvirkar á þessari færslu",
+  "status.cannot_quote": "Þú hefur ekki heimild til að vitna í þessa færslu",
   "status.cannot_reblog": "Þessa færslu er ekki hægt að endurbirta",
   "status.context.load_new_replies": "Ný svör hafa borist",
   "status.context.loading": "Athuga með fleiri svör",

app/javascript/mastodon/locales/it.json

@@ -453,10 +453,12 @@
   "ignore_notifications_modal.private_mentions_title": "Ignorare le notifiche provenienti da menzioni private indesiderate?",
   "info_button.label": "Aiuto",
   "info_button.what_is_alt_text": "<h1>Cos'è il testo alternativo?</h1> <p>Il testo alternativo fornisce descrizioni delle immagini per le persone con disturbi della vista, connessioni a bassa larghezza di banda o per coloro che cercano un contesto aggiuntivo.</p> <p>È possibile migliorare l'accessibilità e la comprensione per tutti scrivendo un testo alt chiaro, conciso e obiettivo.</p> <ul> <li>Cattura elementi importanti</li> <li>Riassume il testo nelle immagini</li> <li>Usa la struttura delle frasi regolari</li> <li>Evita le informazioni ridondanti</li> <li>Concentrati sulle tendenze e i risultati chiave in immagini complesse (come diagrammi o mappe)</li> </ul>",
+  "interaction_modal.action": "Per interagire con il post di {name}, devi accedere al tuo account su qualsiasi server Mastodon tu utilizzi.",
   "interaction_modal.go": "Vai",
   "interaction_modal.no_account_yet": "Non hai ancora un account?",
   "interaction_modal.on_another_server": "Su un altro server",
   "interaction_modal.on_this_server": "Su questo server",
+  "interaction_modal.title": "Accedi per continuare",
   "interaction_modal.username_prompt": "Es. {example}",
   "intervals.full.days": "{number, plural, one {# giorno} other {# giorni}}",
   "intervals.full.hours": "{number, plural, one {# ora} other {# ore}}",
@@ -860,7 +862,7 @@
   "status.block": "Blocca @{name}",
   "status.bookmark": "Aggiungi segnalibro",
   "status.cancel_reblog_private": "Annulla reblog",
-  "status.cannot_quote": "Le citazioni sono disabilitate su questo post",
+  "status.cannot_quote": "Non ti è consentito citare questo post",
   "status.cannot_reblog": "Questo post non può essere condiviso",
   "status.context.load_new_replies": "Nuove risposte disponibili",
   "status.context.loading": "Controllo per altre risposte",

app/javascript/mastodon/locales/ko.json

@@ -860,7 +860,6 @@
   "status.block": "@{name} 차단",
   "status.bookmark": "북마크",
   "status.cancel_reblog_private": "부스트 취소",
-  "status.cannot_quote": "이 게시물은 인용이 비활성화되어 있습니다",
   "status.cannot_reblog": "이 게시물은 부스트 할 수 없습니다",
   "status.context.load_new_replies": "새 답글 보기",
   "status.context.loading": "추가 답글 확인중",

app/javascript/mastodon/locales/nan.json

@@ -860,7 +860,6 @@
   "status.block": "封鎖 @{name}",
   "status.bookmark": "冊籤",
   "status.cancel_reblog_private": "取消轉送",
-  "status.cannot_quote": "Tsit篇PO文停止使用引用功能ah",
   "status.cannot_reblog": "Tsit篇PO文bē當轉送",
   "status.context.load_new_replies": "有新ê回應",
   "status.context.loading": "Leh檢查其他ê回應",

app/javascript/mastodon/locales/nl.json

@@ -453,10 +453,12 @@
   "ignore_notifications_modal.private_mentions_title": "Meldingen negeren van ongevraagde privéberichten?",
   "info_button.label": "Help",
   "info_button.what_is_alt_text": "<h1>Wat is alt-tekst?</h1> <p>Alt-tekst biedt beschrijvingen van afbeeldingen voor mensen met een visuele beperking, voor verbindingen met lage internetsnelheid of mensen die op zoek zijn naar extra context.</p> <p>Je kunt de toegankelijkheid en de begrijpelijkheid voor iedereen verbeteren door heldere, beknopte en objectieve alt-teksten te schrijven.</p> <ul> <li>Leg belangrijke elementen vast</li> <li>Tekst in afbeeldingen samenvatten</li> <li>Een eenvoudige zinsbouw gebruiken</li> <li>Overbodige informatie vermijden</li> <li>Voor complexe diagrammen of kaarten alleen op trends en belangrijke bevindingen focussen</li> </ul>",
+  "interaction_modal.action": "Wanneer je met het bericht van {name} interactie wil hebben, moet je met jouw account op jouw eigen Mastodon-server inloggen.",
   "interaction_modal.go": "Ga",
   "interaction_modal.no_account_yet": "Heb je nog geen account?",
   "interaction_modal.on_another_server": "Op een andere server",
   "interaction_modal.on_this_server": "Op deze server",
+  "interaction_modal.title": "Inloggen om door te gaan",
   "interaction_modal.username_prompt": "Bijv. {example}",
   "intervals.full.days": "{number, plural, one {# dag} other {# dagen}}",
   "intervals.full.hours": "{number, plural, one {# uur} other {# uur}}",
@@ -860,7 +862,7 @@
   "status.block": "@{name} blokkeren",
   "status.bookmark": "Bladwijzer toevoegen",
   "status.cancel_reblog_private": "Niet langer boosten",
-  "status.cannot_quote": "Citaten zijn voor dit bericht uitgeschakeld",
+  "status.cannot_quote": "Je bent niet gemachtigd om dit bericht te citeren",
   "status.cannot_reblog": "Dit bericht kan niet geboost worden",
   "status.context.load_new_replies": "Nieuwe reacties beschikbaar",
   "status.context.loading": "Op nieuwe reacties aan het controleren",
@@ -895,7 +897,7 @@
   "status.quote_error.filtered": "Verborgen door een van je filters",
   "status.quote_error.not_available": "Bericht niet beschikbaar",
   "status.quote_error.pending_approval": "Bericht in afwachting",
-  "status.quote_error.pending_approval_popout.body": "Op Mastodon kun je bepalen of iemand je kan citeren. Dit bericht is in afwachting van de goedkeuring van de oorspronkelijke auteur.",
+  "status.quote_error.pending_approval_popout.body": "Op Mastodon kun je bepalen of iemand je mag citeren. Dit bericht is in afwachting van de goedkeuring van de oorspronkelijke auteur.",
   "status.quote_error.revoked": "Bericht verwijderd door auteur",
   "status.quote_followers_only": "Alleen volgers mogen dit bericht citeren",
   "status.quote_manual_review": "De auteur gaat het handmatig beoordelen",

app/javascript/mastodon/locales/nn.json

@@ -862,7 +862,6 @@
   "status.block": "Blokker @{name}",
   "status.bookmark": "Set bokmerke",
   "status.cancel_reblog_private": "Opphev framheving",
-  "status.cannot_quote": "Du kan ikkje sitera dette innlegget",
   "status.cannot_reblog": "Du kan ikkje framheva dette innlegget",
   "status.context.load_new_replies": "Nye svar finst",
   "status.context.loading": "Ser etter fleire svar",

app/javascript/mastodon/locales/pl.json

@@ -848,7 +848,6 @@
   "status.block": "Zablokuj @{name}",
   "status.bookmark": "Dodaj zakładkę",
   "status.cancel_reblog_private": "Cofnij podbicie",
-  "status.cannot_quote": "Cytaty są wyłączone dla tego postu",
   "status.cannot_reblog": "Ten wpis nie może zostać podbity",
   "status.context.load_new_replies": "Dostępne są nowe odpowiedzi",
   "status.context.loading": "Sprawdzanie kolejnych odpowiedzi",

app/javascript/mastodon/locales/pt-PT.json

@@ -860,7 +860,6 @@
   "status.block": "Bloquear @{name}",
   "status.bookmark": "Guardar nos marcadores",
   "status.cancel_reblog_private": "Retirar impulso",
-  "status.cannot_quote": "Citações estão desativadas nesta publicação",
   "status.cannot_reblog": "Esta publicação não pode ser impulsionada",
   "status.context.load_new_replies": "Novas respostas disponíveis",
   "status.context.loading": "A verificar por mais respostas",

app/javascript/mastodon/locales/ru.json

@@ -862,7 +862,6 @@
   "status.block": "Заблокировать @{name}",
   "status.bookmark": "Добавить в закладки",
   "status.cancel_reblog_private": "Отменить продвижение",
-  "status.cannot_quote": "Цитаты отключены на этой публикации",
   "status.cannot_reblog": "Этот пост не может быть продвинут",
   "status.context.load_new_replies": "Доступны новые ответы",
   "status.context.loading": "Проверяем, есть ли ещё ответы",

app/javascript/mastodon/locales/tr.json

@@ -241,6 +241,8 @@
   "confirmations.mute.confirm": "Sessize al",
   "confirmations.quiet_post_quote_info.dismiss": "Bana bir daha hatırlatma",
   "confirmations.quiet_post_quote_info.got_it": "Anladım",
+  "confirmations.quiet_post_quote_info.message": "Sessiz bir genel gönderiyi alıntıladığınızda, gönderiniz öne çıkan zaman çizelgelerinden gizlenir.",
+  "confirmations.quiet_post_quote_info.title": "Herkese açık sessiz gönderileri alıntılamak",
   "confirmations.redraft.confirm": "Sil Düzenle ve yeniden paylaş",
   "confirmations.redraft.message": "Bu gönderiyi silip taslak haline getirmek istediğinize emin misiniz? Mevcut favoriler ve boostlar silinecek ve gönderiye verilen yanıtlar başıboş kalacak.",
   "confirmations.redraft.title": "Gönderiyi sil veya taslağa dönüştür?",
@@ -451,10 +453,12 @@
   "ignore_notifications_modal.private_mentions_title": "İstenmeyen özel bahsetmelerden gelen bildirimleri yoksay?",
   "info_button.label": "Yardım",
   "info_button.what_is_alt_text": "<h1>Alternatif metin nedir?</h1><p>Alternatif metin, görme bozukluğu olan, düşük bant genişliğine sahip bağlantıları olan veya ekstra bağlam arayan kişiler için görsel açıklamaları sağlar.</p><p>Net, sade ve nesnel alternatif metin yazarak herkes için erişilebilirliği ve anlaşılabilirliği iyileştirebilirsiniz.</p><ul><li>Önemlileri yakalayın</li><li>Resimlerdeki metni özetleyin</li><li>Düzenli cümle yapısı kullanın</li><li>Gereksiz bilgilerden kaçının</li><li>Karmaşık görsellerde (şemalar veya haritalar gibi) trendlere ve temel bulgulara odaklanın</li></ul>",
+  "interaction_modal.action": "{name}'nin gönderisiyle etkileşim kurmak için, kullandığınız Mastodon sunucusunda hesabınıza giriş yapmanız gerekir.",
   "interaction_modal.go": "Git",
   "interaction_modal.no_account_yet": "Henüz bir hesabınız yok mu?",
   "interaction_modal.on_another_server": "Farklı bir sunucuda",
   "interaction_modal.on_this_server": "Bu sunucuda",
+  "interaction_modal.title": "Devam etmek için oturum açın",
   "interaction_modal.username_prompt": "Örnek: {example}",
   "intervals.full.days": "{number, plural, one {# gün} other {# gün}}",
   "intervals.full.hours": "{number, plural, one {# saat} other {# saat}}",
@@ -737,6 +741,7 @@
   "privacy.quote.disabled": "{visibility}, alıntı yapılamaz",
   "privacy.quote.limited": "{visibility}, sınırlı alıntı",
   "privacy.unlisted.additional": "Bu neredeyse herkese açık gibi çalışır, tek farkı gönderi canlı akışlarda veya etiketlerde, keşfette, veya Mastodon aramasında gözükmez, hesap çapında öyle seçmiş olsanız bile.",
+  "privacy.unlisted.long": "Mastodon arama sonuçlarında, öne çıkanlarda ve herkese açık zaman çizelgesinde gizli",
   "privacy.unlisted.short": "Sessizce herkese açık",
   "privacy_policy.last_updated": "Son güncelleme {date}",
   "privacy_policy.title": "Gizlilik Politikası",
@@ -759,6 +764,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}sn",
   "relative_time.today": "bugün",
+  "remove_quote_hint.button_label": "Anladım",
+  "remove_quote_hint.message": "Bunu {icon} seçenekler menüsünden yapabilirsiniz.",
+  "remove_quote_hint.title": "Alıntılanmış gönderinizi kaldırmak mı istiyorsunuz?",
   "reply_indicator.attachments": "{count, plural, one {# ek} other {# ek}}",
   "reply_indicator.cancel": "İptal",
   "reply_indicator.poll": "Anket",
@@ -854,6 +862,7 @@
   "status.block": "@{name} adlı kişiyi engelle",
   "status.bookmark": "Yer işareti ekle",
   "status.cancel_reblog_private": "Yeniden paylaşımı geri al",
+  "status.cannot_quote": "Bu gönderiyi alıntılamaya izniniz yok",
   "status.cannot_reblog": "Bu gönderi yeniden paylaşılamaz",
   "status.context.load_new_replies": "Yeni yanıtlar mevcut",
   "status.context.loading": "Daha fazla yanıt için kontrol ediliyor",
@@ -888,6 +897,8 @@
   "status.quote_error.filtered": "Bazı filtrelerinizden dolayı gizlenmiştir",
   "status.quote_error.not_available": "Gönderi kullanılamıyor",
   "status.quote_error.pending_approval": "Gönderi beklemede",
+  "status.quote_error.pending_approval_popout.body": "Mastodon'da, birinin sizi alıntılayıp alıntılayamayacağını kontrol edebilirsiniz. Bu gönderi, orijinal yazarın onayını alma sürecinde beklemede.",
+  "status.quote_error.revoked": "Gönderi yazarı tarafından kaldırıldı",
   "status.quote_followers_only": "Sadece takipçiler bu gönderiyi alıntılayabilir",
   "status.quote_manual_review": "Yazar manuel olarak gözden geçirecek",
   "status.quote_policy_change": "Kimin alıntı yapabileceğini değiştirin",
@@ -898,12 +909,14 @@
   "status.read_more": "Devamını okuyun",
   "status.reblog": "Yeniden paylaş",
   "status.reblog_or_quote": "Yükselt veya alıntıla",
+  "status.reblog_private": "Takipçilerinizle tekrar paylaşın",
   "status.reblogged_by": "{name} yeniden paylaştı",
   "status.reblogs": "{count, plural, one {yeniden paylaşım} other {yeniden paylaşım}}",
   "status.reblogs.empty": "Henüz hiç kimse bu gönderiyi yeniden paylaşmadı. Herhangi bir kullanıcı yeniden paylaştığında burada görüntülenecek.",
   "status.redraft": "Sil,Düzenle ve yeniden-paylaş",
   "status.remove_bookmark": "Yer işaretini kaldır",
   "status.remove_favourite": "Favorilerden kaldır",
+  "status.remove_quote": "Kaldır",
   "status.replied_in_thread": "Akışta yanıtlandı",
   "status.replied_to": "{name} kullanıcısına yanıt verdi",
   "status.reply": "Yanıtla",
@@ -975,9 +988,14 @@
   "visibility_modal.button_title": "Görünürlüğü ayarla",
   "visibility_modal.header": "Görünürlük ve etkileşim",
   "visibility_modal.helper.direct_quoting": "Mastodon'da özel değiniler başkaları tarafından alıntılanamaz.",
+  "visibility_modal.helper.privacy_editing": "Gönderi yayınlandıktan sonra görünürlük değiştirilemez.",
+  "visibility_modal.helper.privacy_private_self_quote": "Özel gönderilerin kendi alıntıları herkese açık hale getirilemez.",
   "visibility_modal.helper.private_quoting": "Mastodon'da sadece takipçilere yönelik gönderiler başkaları tarafından alıntılanamaz.",
   "visibility_modal.helper.unlisted_quoting": "İnsanlar sizden alıntı yaptığında, onların gönderileri de trend zaman tünellerinden gizlenecektir.",
+  "visibility_modal.instructions": "Bu gönderiyle kimlerin etkileşime girebileceğini kontrol edin. Ayrıca, <link>Tercihler > Gönderme varsayılanları</link> bölümüne giderek tüm gelecek gönderiler için ayarlayabilirsiniz.",
+  "visibility_modal.privacy_label": "Görünürlük",
   "visibility_modal.quote_followers": "Sadece takipçiler",
+  "visibility_modal.quote_label": "Kimler alıntılayabilir",
   "visibility_modal.quote_nobody": "Sadece ben",
   "visibility_modal.quote_public": "Herkesten",
   "visibility_modal.save": "Kaydet"

app/javascript/mastodon/locales/vi.json

@@ -860,7 +860,6 @@
   "status.block": "Chặn @{name}",
   "status.bookmark": "Lưu",
   "status.cancel_reblog_private": "Bỏ đăng lại",
-  "status.cannot_quote": "Trích dẫn bị tắt",
   "status.cannot_reblog": "Không thể đăng lại tút này",
   "status.context.load_new_replies": "Có những trả lời mới",
   "status.context.loading": "Kiểm tra nhiều trả lời hơn",

app/javascript/mastodon/locales/zh-CN.json

@@ -453,10 +453,12 @@
   "ignore_notifications_modal.private_mentions_title": "是否忽略不请自来的私下提及？",
   "info_button.label": "帮助",
   "info_button.what_is_alt_text": "<h1>什么是替代文本？</h1> <p>替代文本为视力障碍者、低带宽连接用户或需要额外背景信息的用户提供图像描述。</p> <p>通过编写清晰、简洁、客观的替代文本，可以提升所有人的可访问性和理解力。</p> <ul> <li>捕捉重要元素</li> <li>总结图像中的文本</li> <li>使用常规句子结构</li> <li>避免冗余信息</li> <li>关注复杂视觉内容(如图表或地图)中的趋势和关键信息</li> </ul>",
+  "interaction_modal.action": "要和 {name} 的嘟文互动，你需要登录到你在Mastodon服务器上注册的账号。",
   "interaction_modal.go": "跳转",
   "interaction_modal.no_account_yet": "还没有账号？",
   "interaction_modal.on_another_server": "在另一服务器",
   "interaction_modal.on_this_server": "在此服务器",
+  "interaction_modal.title": "登录以继续",
   "interaction_modal.username_prompt": "例如: {example}",
   "intervals.full.days": "{number} 天",
   "intervals.full.hours": "{number} 小时",
@@ -860,7 +862,7 @@
   "status.block": "屏蔽 @{name}",
   "status.bookmark": "添加到书签",
   "status.cancel_reblog_private": "取消转嘟",
-  "status.cannot_quote": "此嘟文已禁用引用功能",
+  "status.cannot_quote": "你无法引用此嘟文",
   "status.cannot_reblog": "不能转嘟这条嘟文",
   "status.context.load_new_replies": "有新回复",
   "status.context.loading": "正在检查更多回复",

app/javascript/mastodon/locales/zh-TW.json

@@ -862,7 +862,7 @@
   "status.block": "封鎖 @{name}",
   "status.bookmark": "書籤",
   "status.cancel_reblog_private": "取消轉嘟",
-  "status.cannot_quote": "此嘟文已停用引用功能",
+  "status.cannot_quote": "您不被允許引用此嘟文",
   "status.cannot_reblog": "這則嘟文無法被轉嘟",
   "status.context.load_new_replies": "有新回嘟",
   "status.context.loading": "正在檢查更多回嘟",

config/locales/simple_form.tr.yml

@@ -56,6 +56,8 @@ tr:
         scopes: Uygulamanın erişmesine izin verilen API'ler. Üst seviye bir kapsam seçtiyseniz, bireysel kapsam seçmenize gerek yoktur.
         setting_aggregate_reblogs: Yakın zamanda teşvik edilmiş gönderiler için yeni teşvikleri göstermeyin (yalnızca yeni alınan teşvikleri etkiler)
         setting_always_send_emails: Normalde, Mastodon'u aktif olarak kullanırken e-posta bildirimleri gönderilmeyecektir
+        setting_default_quote_policy_private: Mastodon'da sadece takipçilere yönelik gönderiler başkaları tarafından alıntılanamaz.
+        setting_default_quote_policy_unlisted: İnsanlar sizden alıntı yaptığında, onların gönderileri de trend zaman tünellerinden gizlenecektir.
         setting_default_sensitive: Hassas medya varsayılan olarak gizlidir ve bir tıklama ile gösterilebilir
         setting_display_media_default: Hassas olarak işaretlenmiş medyayı gizle
         setting_display_media_hide_all: Medyayı her zaman gizle

config/locales/tr.yml

@@ -1739,6 +1739,9 @@ tr:
       self_vote: Kendi anketlerinizde oy kullanamazsınız
       too_few_options: birden fazla öğeye sahip olmalı
       too_many_options: "%{max} öğeden fazla öğe içeremez"
+    vote: Oyla
+  posting_defaults:
+    explanation: Bu ayarlar, yeni gönderiler oluştururken varsayılan olarak kullanılacaktır, ancak bunları oluşturucu içinde her gönderi için ayrı ayrı düzenleyebilirsiniz.
   preferences:
     other: Diğer
     posting_defaults: Gönderi varsayılanları
@@ -1915,8 +1918,10 @@ tr:
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Özel değini
+      private: Sadece takipçiler
       public: Herkese açık
       public_long: Mastodon'da olan olmayan herkes
+      unlisted: Sessizce herkese açık
       unlisted_long: Mastodon arama sonuçlarında, öne çıkanlarda ve herkese açık zaman çizelgesinde gizli
   statuses_cleanup:
     enabled: Eski gönderileri otomatik olarak sil

spec/requests/api/v1/statuses_spec.rb

@@ -158,6 +158,28 @@ RSpec.describe '/api/v1/statuses' do
         end
       end
 
+      context 'without a quote policy', feature: :outgoing_quotes do
+        let(:user) do
+          Fabricate(:user, settings: { default_quote_policy: 'followers' })
+        end
+
+        it 'returns post with user default quote policy, as well as rate limit headers', :aggregate_failures do
+          subject
+          expect(user.setting_default_quote_policy).to eq 'followers'
+
+          expect(response).to have_http_status(200)
+          expect(response.content_type)
+            .to start_with('application/json')
+          expect(response.parsed_body[:quote_approval]).to include({
+            automatic: ['followers'],
+            manual: [],
+            current_user: 'automatic',
+          })
+          expect(response.headers['X-RateLimit-Limit']).to eq RateLimiter::FAMILIES[:statuses][:limit].to_s
+          expect(response.headers['X-RateLimit-Remaining']).to eq (RateLimiter::FAMILIES[:statuses][:limit] - 1).to_s
+        end
+      end
+
       context 'with a quote policy', feature: :outgoing_quotes do
         let(:quoted_status) { Fabricate(:status, account: user.account) }
         let(:params) do

streaming/package.json

@@ -21,7 +21,7 @@
     "dotenv": "^16.0.3",
     "express": "^4.18.2",
     "ioredis": "^5.3.2",
-    "jsdom": "^26.0.0",
+    "jsdom": "^27.0.0",
     "pg": "^8.5.0",
     "pg-connection-string": "^2.6.0",
     "pino": "^9.0.0",

yarn.lock

@@ -42,16 +42,35 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@asamuzakjp/css-color@npm:^2.8.2":
+"@asamuzakjp/css-color@npm:^4.0.3":
-  version: 2.8.2
+  version: 4.0.4
-  resolution: "@asamuzakjp/css-color@npm:2.8.2"
+  resolution: "@asamuzakjp/css-color@npm:4.0.4"
   dependencies:
-    "@csstools/css-calc": "npm:^2.1.1"
+    "@csstools/css-calc": "npm:^2.1.4"
-    "@csstools/css-color-parser": "npm:^3.0.7"
+    "@csstools/css-color-parser": "npm:^3.0.10"
-    "@csstools/css-parser-algorithms": "npm:^3.0.4"
+    "@csstools/css-parser-algorithms": "npm:^3.0.5"
-    "@csstools/css-tokenizer": "npm:^3.0.3"
+    "@csstools/css-tokenizer": "npm:^3.0.4"
-    lru-cache: "npm:^11.0.2"
+    lru-cache: "npm:^11.1.0"
-  checksum: 10c0/352b91ca7741876e459cd3cb350a969e842da1e532577157d38365a6da89b7d6e6944249489366ee61b8a225ede1b521e7ab305b70ad4c688b01404061eecca8
+  checksum: 10c0/5a4eb3c8594f58f3df06c867a6cda4a33f702f5cd682d6afa5074813f16fd05e732653ac79bd6fc66390554e158ac478103ad5e885fd9cf154b69bb67639e82f
+  languageName: node
+  linkType: hard
+
+"@asamuzakjp/dom-selector@npm:^6.5.4":
+  version: 6.5.4
+  resolution: "@asamuzakjp/dom-selector@npm:6.5.4"
+  dependencies:
+    "@asamuzakjp/nwsapi": "npm:^2.3.9"
+    bidi-js: "npm:^1.0.3"
+    css-tree: "npm:^3.1.0"
+    is-potential-custom-element-name: "npm:^1.0.1"
+  checksum: 10c0/aeb032b0f7832c891d5f9900b381fe0c7187343eb46a353f07ffbaac2d222bb80ac7504006e7e1b4c45af9e640fd093e14f951870a146d3ad80fd67670c9a115
+  languageName: node
+  linkType: hard
+
+"@asamuzakjp/nwsapi@npm:^2.3.9":
+  version: 2.3.9
+  resolution: "@asamuzakjp/nwsapi@npm:2.3.9"
+  checksum: 10c0/869b81382e775499c96c45c6dbe0d0766a6da04bcf0abb79f5333535c4e19946851acaa43398f896e2ecc5a1de9cf3db7cf8c4b1afac1ee3d15e21584546d74d
   languageName: node
   linkType: hard
 
@@ -1256,7 +1275,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-calc@npm:^2.1.1, @csstools/css-calc@npm:^2.1.4":
+"@csstools/css-calc@npm:^2.1.4":
   version: 2.1.4
   resolution: "@csstools/css-calc@npm:2.1.4"
   peerDependencies:
@@ -1266,7 +1285,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-color-parser@npm:^3.0.10, @csstools/css-color-parser@npm:^3.0.7":
+"@csstools/css-color-parser@npm:^3.0.10":
   version: 3.0.10
   resolution: "@csstools/css-color-parser@npm:3.0.10"
   dependencies:
@@ -1279,7 +1298,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^3.0.4, @csstools/css-parser-algorithms@npm:^3.0.5":
+"@csstools/css-parser-algorithms@npm:^3.0.5":
   version: 3.0.5
   resolution: "@csstools/css-parser-algorithms@npm:3.0.5"
   peerDependencies:
@@ -1288,7 +1307,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-tokenizer@npm:^3.0.3, @csstools/css-tokenizer@npm:^3.0.4":
+"@csstools/css-syntax-patches-for-csstree@npm:^1.0.14":
+  version: 1.0.14
+  resolution: "@csstools/css-syntax-patches-for-csstree@npm:1.0.14"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/e431cf5aa4ccd6a40f4a417663ac7178c822c5427b9c8473e466257dc46dd9698e3852d5517ec220b7d1d1ea911e9007ecb429464329ae169a0aa68b56f1c3ac
+  languageName: node
+  linkType: hard
+
+"@csstools/css-tokenizer@npm:^3.0.4":
   version: 3.0.4
   resolution: "@csstools/css-tokenizer@npm:3.0.4"
   checksum: 10c0/3b589f8e9942075a642213b389bab75a2d50d05d203727fcdac6827648a5572674caff07907eff3f9a2389d86a4ee47308fafe4f8588f4a77b7167c588d2559f
@@ -2791,7 +2819,7 @@ __metadata:
     express: "npm:^4.18.2"
     globals: "npm:^16.0.0"
     ioredis: "npm:^5.3.2"
-    jsdom: "npm:^26.0.0"
+    jsdom: "npm:^27.0.0"
     pg: "npm:^8.5.0"
     pg-connection-string: "npm:^2.6.0"
     pino: "npm:^9.0.0"
@@ -5414,6 +5442,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bidi-js@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "bidi-js@npm:1.0.3"
+  dependencies:
+    require-from-string: "npm:^2.0.2"
+  checksum: 10c0/fdddea4aa4120a34285486f2267526cd9298b6e8b773ad25e765d4f104b6d7437ab4ba542e6939e3ac834a7570bcf121ee2cf6d3ae7cd7082c4b5bedc8f271e1
+  languageName: node
+  linkType: hard
+
 "binary-extensions@npm:^2.0.0":
   version: 2.3.0
   resolution: "binary-extensions@npm:2.3.0"
@@ -6113,13 +6150,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssstyle@npm:^4.2.1":
+"cssstyle@npm:^5.3.0":
-  version: 4.2.1
+  version: 5.3.0
-  resolution: "cssstyle@npm:4.2.1"
+  resolution: "cssstyle@npm:5.3.0"
   dependencies:
-    "@asamuzakjp/css-color": "npm:^2.8.2"
+    "@asamuzakjp/css-color": "npm:^4.0.3"
-    rrweb-cssom: "npm:^0.8.0"
+    "@csstools/css-syntax-patches-for-csstree": "npm:^1.0.14"
-  checksum: 10c0/02ba8c47c0caaab57acadacb3eb6c0f5f009000f55d61f6563670e07d389b26edefeed497e6c1847fcd2e6bbe0b6974c2d4291f97fa0c6ec6add13a7fa926d84
+    css-tree: "npm:^3.1.0"
+  checksum: 10c0/6ceddc5b696d1220b9a3e41775860f58d29046cdbabc1e6b9c19bc48a6bfdcde749c45023417abf7ca3319429566c079a3e6f6e191ceab159dbced6187cb8b7c
   languageName: node
   linkType: hard
 
@@ -6137,13 +6175,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"data-urls@npm:^5.0.0":
+"data-urls@npm:^6.0.0":
-  version: 5.0.0
+  version: 6.0.0
-  resolution: "data-urls@npm:5.0.0"
+  resolution: "data-urls@npm:6.0.0"
   dependencies:
     whatwg-mimetype: "npm:^4.0.0"
-    whatwg-url: "npm:^14.0.0"
+    whatwg-url: "npm:^15.0.0"
-  checksum: 10c0/1b894d7d41c861f3a4ed2ae9b1c3f0909d4575ada02e36d3d3bc584bdd84278e20709070c79c3b3bff7ac98598cb191eb3e86a89a79ea4ee1ef360e1694f92ad
+  checksum: 10c0/952102a8e6282fea112f7120d79fac482a2f99e20c67f9cb069d661c00627305b042e1f7e3cef8e4bbc795b42c5d481bbc9c6effeff5bb1427f9acaf1722bd35
   languageName: node
   linkType: hard
 
@@ -6543,13 +6581,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"entities@npm:^4.4.0, entities@npm:^4.5.0":
+"entities@npm:^4.4.0":
   version: 4.5.0
   resolution: "entities@npm:4.5.0"
   checksum: 10c0/5b039739f7621f5d1ad996715e53d964035f75ad3b9a4d38c6b3804bb226e282ffeae2443624d8fdd9c47d8e926ae9ac009c54671243f0c3294c26af7cc85250
   languageName: node
   linkType: hard
 
+"entities@npm:^6.0.0":
+  version: 6.0.1
+  resolution: "entities@npm:6.0.1"
+  checksum: 10c0/ed836ddac5acb34341094eb495185d527bd70e8632b6c0d59548cbfa23defdbae70b96f9a405c82904efa421230b5b3fd2283752447d737beffd3f3e6ee74414
+  languageName: node
+  linkType: hard
+
 "env-paths@npm:^2.2.0, env-paths@npm:^2.2.1":
   version: 2.2.1
   resolution: "env-paths@npm:2.2.1"
@@ -8777,36 +8822,36 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsdom@npm:^26.0.0":
+"jsdom@npm:^27.0.0":
-  version: 26.1.0
+  version: 27.0.0
-  resolution: "jsdom@npm:26.1.0"
+  resolution: "jsdom@npm:27.0.0"
   dependencies:
-    cssstyle: "npm:^4.2.1"
+    "@asamuzakjp/dom-selector": "npm:^6.5.4"
-    data-urls: "npm:^5.0.0"
+    cssstyle: "npm:^5.3.0"
+    data-urls: "npm:^6.0.0"
     decimal.js: "npm:^10.5.0"
     html-encoding-sniffer: "npm:^4.0.0"
     http-proxy-agent: "npm:^7.0.2"
     https-proxy-agent: "npm:^7.0.6"
     is-potential-custom-element-name: "npm:^1.0.1"
-    nwsapi: "npm:^2.2.16"
+    parse5: "npm:^7.3.0"
-    parse5: "npm:^7.2.1"
     rrweb-cssom: "npm:^0.8.0"
     saxes: "npm:^6.0.0"
     symbol-tree: "npm:^3.2.4"
-    tough-cookie: "npm:^5.1.1"
+    tough-cookie: "npm:^6.0.0"
     w3c-xmlserializer: "npm:^5.0.0"
-    webidl-conversions: "npm:^7.0.0"
+    webidl-conversions: "npm:^8.0.0"
     whatwg-encoding: "npm:^3.1.1"
     whatwg-mimetype: "npm:^4.0.0"
-    whatwg-url: "npm:^14.1.1"
+    whatwg-url: "npm:^15.0.0"
-    ws: "npm:^8.18.0"
+    ws: "npm:^8.18.2"
     xml-name-validator: "npm:^5.0.0"
   peerDependencies:
     canvas: ^3.0.0
   peerDependenciesMeta:
     canvas:
       optional: true
-  checksum: 10c0/5b14a5bc32ce077a06fb42d1ab95b1191afa5cbbce8859e3b96831c5143becbbcbf0511d4d4934e922d2901443ced2cdc3b734c1cf30b5f73b3e067ce457d0f4
+  checksum: 10c0/cc977bd0f48f92b275166b3e64622d83c2073dc309b790ed806246365985743295a7735bc8519a186ccffd42d1f2c16a0fa52a4ea79d2b329a948756db64ade1
   languageName: node
   linkType: hard
 
@@ -9190,10 +9235,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^11.0.2":
+"lru-cache@npm:^11.1.0":
-  version: 11.0.2
+  version: 11.2.1
-  resolution: "lru-cache@npm:11.0.2"
+  resolution: "lru-cache@npm:11.2.1"
-  checksum: 10c0/c993b8e06ead0b24b969c1dbb5b301716aed66e320e9014a80012f5febe280b438f28ff50046b2c55ff404e889351ccb332ff91f8dd175a21f5eae80e3fb155f
+  checksum: 10c0/6f0e6b27f368d5e464e7813bd5b0af8f9a81a3a7ce2f40509841fdef07998b2588869f3e70edfbdb3bf705857f7bb21cca58fb01e1a1dc2440a83fcedcb7e8d8
   languageName: node
   linkType: hard
 
@@ -9731,13 +9776,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nwsapi@npm:^2.2.16":
-  version: 2.2.16
-  resolution: "nwsapi@npm:2.2.16"
-  checksum: 10c0/0aa0637f4d51043d0183d994e08336bae996b03b42984381bf09ebdf3ff4909c018eda6b2a8aba0a08f3ea8303db8a0dad0608b38dc0bff15fd87017286ae21a
-  languageName: node
-  linkType: hard
-
 "object-assign@npm:^4, object-assign@npm:^4.1.1":
   version: 4.1.1
   resolution: "object-assign@npm:4.1.1"
@@ -9993,12 +10031,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"parse5@npm:^7.2.1":
+"parse5@npm:^7.3.0":
-  version: 7.2.1
+  version: 7.3.0
-  resolution: "parse5@npm:7.2.1"
+  resolution: "parse5@npm:7.3.0"
   dependencies:
-    entities: "npm:^4.5.0"
+    entities: "npm:^6.0.0"
-  checksum: 10c0/829d37a0c709215a887e410a7118d754f8e1afd7edb529db95bc7bbf8045fb0266a7b67801331d8e8d9d073ea75793624ec27ce9ff3b96862c3b9008f4d68e80
+  checksum: 10c0/7fd2e4e247e85241d6f2a464d0085eed599a26d7b0a5233790c49f53473232eb85350e8133344d9b3fd58b89339e7ad7270fe1f89d28abe50674ec97b87f80b5
   languageName: node
   linkType: hard
 
@@ -13111,21 +13149,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tldts-core@npm:^6.1.47":
+"tldts-core@npm:^7.0.14":
-  version: 6.1.47
+  version: 7.0.14
-  resolution: "tldts-core@npm:6.1.47"
+  resolution: "tldts-core@npm:7.0.14"
-  checksum: 10c0/538372072aea7153e842646a9e22d0d9335acf7fd877d10ee374cf78dceff79a2ccebadf7d25e0dbddd7b7b60bafe1c885aac3e3b1d5bec7806963c89b163ee7
+  checksum: 10c0/e35f006e3376c70ea2cde436fc808b3017322de62246e7e4a733cc09a60959711cd9dbfd91b67ffe52fbee215d9e41911a39b6c20e8f45544b09f7662355753f
   languageName: node
   linkType: hard
 
-"tldts@npm:^6.1.32":
+"tldts@npm:^7.0.5":
-  version: 6.1.47
+  version: 7.0.14
-  resolution: "tldts@npm:6.1.47"
+  resolution: "tldts@npm:7.0.14"
   dependencies:
-    tldts-core: "npm:^6.1.47"
+    tldts-core: "npm:^7.0.14"
   bin:
     tldts: bin/cli.js
-  checksum: 10c0/42c999ab24ce3ab221cfefe77488d145d16d9523524913badaa4af4f1f0d65e0a92a678659b22b7d26d1c62796540c95158049220c9ff243090b93470f236302
+  checksum: 10c0/87dd69b68e07c0cb3913c4b7fb4a57a3b4826a664637725ab9226aa01a4786d003c181b0525d09bfb1bb0c16802b4350620443da64d9e947a7ff4c19f2f4acbf
   languageName: node
   linkType: hard
 
@@ -13164,12 +13202,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tough-cookie@npm:^5.1.1":
+"tough-cookie@npm:^6.0.0":
-  version: 5.1.2
+  version: 6.0.0
-  resolution: "tough-cookie@npm:5.1.2"
+  resolution: "tough-cookie@npm:6.0.0"
   dependencies:
-    tldts: "npm:^6.1.32"
+    tldts: "npm:^7.0.5"
-  checksum: 10c0/5f95023a47de0f30a902bba951664b359725597d8adeabc66a0b93a931c3af801e1e697dae4b8c21a012056c0ea88bd2bf4dfe66b2adcf8e2f42cd9796fe0626
+  checksum: 10c0/7b17a461e9c2ac0d0bea13ab57b93b4346d0b8c00db174c963af1e46e4ea8d04148d2a55f2358fc857db0c0c65208a98e319d0c60693e32e0c559a9d9cf20cb5
   languageName: node
   linkType: hard
 
@@ -13189,12 +13227,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tr46@npm:^5.1.0":
+"tr46@npm:^5.1.1":
-  version: 5.1.0
+  version: 5.1.1
-  resolution: "tr46@npm:5.1.0"
+  resolution: "tr46@npm:5.1.1"
   dependencies:
     punycode: "npm:^2.3.1"
-  checksum: 10c0/d761f7144e0cb296187674ef245c74f761e334d7cf25ca73ef60e4c72c097c75051031c093fa1a2fee04b904977b316716a7915854bcae8fb1a371746513cbe8
+  checksum: 10c0/ae270e194d52ec67ebd695c1a42876e0f19b96e4aca2ab464ab1d9d17dc3acd3e18764f5034c93897db73421563be27c70c98359c4501136a497e46deda5d5ec
   languageName: node
   linkType: hard
 
@@ -14023,10 +14061,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webidl-conversions@npm:^7.0.0":
+"webidl-conversions@npm:^8.0.0":
-  version: 7.0.0
+  version: 8.0.0
-  resolution: "webidl-conversions@npm:7.0.0"
+  resolution: "webidl-conversions@npm:8.0.0"
-  checksum: 10c0/228d8cb6d270c23b0720cb2d95c579202db3aaf8f633b4e9dd94ec2000a04e7e6e43b76a94509cdb30479bd00ae253ab2371a2da9f81446cc313f89a4213a2c4
+  checksum: 10c0/3244e8a6534163bc3ee5f5f48b507b4bb74e34e7cc7c86a50cd02734753042b88343dae48321f34ad61ddc6b5c90cb1a5b2ee757b8be8e6fadc587a9f3db76cd
   languageName: node
   linkType: hard
 
@@ -14053,13 +14091,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-url@npm:^14.0.0, whatwg-url@npm:^14.1.1":
+"whatwg-url@npm:^15.0.0":
-  version: 14.2.0
+  version: 15.0.0
-  resolution: "whatwg-url@npm:14.2.0"
+  resolution: "whatwg-url@npm:15.0.0"
   dependencies:
-    tr46: "npm:^5.1.0"
+    tr46: "npm:^5.1.1"
-    webidl-conversions: "npm:^7.0.0"
+    webidl-conversions: "npm:^8.0.0"
-  checksum: 10c0/f746fc2f4c906607d09537de1227b13f9494c171141e5427ed7d2c0dd0b6a48b43d8e71abaae57d368d0c06b673fd8ec63550b32ad5ed64990c7b0266c2b4272
+  checksum: 10c0/7b4f633fcd8fea6d588fb5694a9c4631382b41d31270e1fb3b755923f2c267d456ea1c7122124689e430b6a4e73c7e43e0731f833b33bfedcfffa2a7b4efbfc0
   languageName: node
   linkType: hard