gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-07-15 16:58:14 +00:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

fix: Fetch missing nested quotes (#35016)

Browse Source
This commit is contained in:
diondiondion 2025-06-12 05:24:58 +02:00 committed by GitHub
parent 3aed93711c
commit d4d77ace97
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/javascript/mastodon/components/status_quoted.tsx
View File

@ -1,4 +1,4 @@
import { useMemo } from 'react'; import { useEffect, useMemo } from 'react';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
@ -13,9 +13,10 @@ import { Icon } from 'mastodon/components/icon';
import StatusContainer from 'mastodon/containers/status_container'; import StatusContainer from 'mastodon/containers/status_container';
import type { Status } from 'mastodon/models/status'; import type { Status } from 'mastodon/models/status';
import type { RootState } from 'mastodon/store'; import type { RootState } from 'mastodon/store';
import { useAppSelector } from 'mastodon/store'; import { useAppDispatch, useAppSelector } from 'mastodon/store';
import QuoteIcon from '../../images/quote.svg?react'; import QuoteIcon from '../../images/quote.svg?react';
import { fetchStatus } from '../actions/statuses';
import { makeGetStatus } from '../selectors'; import { makeGetStatus } from '../selectors';
const MAX_QUOTE_POSTS_NESTING_LEVEL = 1; const MAX_QUOTE_POSTS_NESTING_LEVEL = 1;
@ -36,7 +37,7 @@ const QuoteWrapper: React.FC<{
); );
}; };
const QuoteLink: React.FC<{ const NestedQuoteLink: React.FC<{
status: Status; status: Status;
}> = ({ status }) => { }> = ({ status }) => {
const accountId = status.get('account') as string; const accountId = status.get('account') as string;
@ -80,12 +81,18 @@ export const QuotedStatus: React.FC<{
variant?: 'full' | 'link'; variant?: 'full' | 'link';
nestingLevel?: number; nestingLevel?: number;
}> = ({ quote, contextType, nestingLevel = 1, variant = 'full' }) => { }> = ({ quote, contextType, nestingLevel = 1, variant = 'full' }) => {
const dispatch = useAppDispatch();
const quotedStatusId = quote.get('quoted_status'); const quotedStatusId = quote.get('quoted_status');
const quoteState = quote.get('state'); const quoteState = quote.get('state');
const status = useAppSelector((state) => const status = useAppSelector((state) =>
quotedStatusId ? state.statuses.get(quotedStatusId) : undefined, quotedStatusId ? state.statuses.get(quotedStatusId) : undefined,
); );
let quoteError: React.ReactNode = null;
useEffect(() => {
if (!status) {
dispatch(fetchStatus(quotedStatusId));
}
}, [status, quotedStatusId, dispatch]);
// In order to find out whether the quoted post should be completely hidden // In order to find out whether the quoted post should be completely hidden
// due to a matching filter, we run it through the selector used by `status_container`. // due to a matching filter, we run it through the selector used by `status_container`.
@ -96,6 +103,8 @@ export const QuotedStatus: React.FC<{
); );
const isFilteredAndHidden = status && statusWithExtraData === null; const isFilteredAndHidden = status && statusWithExtraData === null;
let quoteError: React.ReactNode = null;
if (isFilteredAndHidden) { if (isFilteredAndHidden) {
quoteError = ( quoteError = (
<FormattedMessage <FormattedMessage
@ -145,7 +154,7 @@ export const QuotedStatus: React.FC<{
} }
if (variant === 'link' && status) { if (variant === 'link' && status) {
return <QuoteLink status={status} />; return <NestedQuoteLink status={status} />;
} }
const childQuote = status?.get('quote') as QuoteMap | undefined; const childQuote = status?.get('quote') as QuoteMap | undefined;