CloudToys/REI-Fixed
1
0
Fork 0
Code

fix: direct problem

Browse Source
This commit is contained in:
オスカー、 2024-04-07 21:06:38 +09:00
parent 58dca158f6
commit 209d2aeff9
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/javascript/mastodon/features/account_direct/index.jsx
View File

@ -1,5 +1,7 @@
import PropTypes from 'prop-types';
import {defineMessages, FormattedMessage } from 'react-intl';
import { FormattedMessage } from 'react-intl';
import { Helmet } from 'react-helmet';
import { List as ImmutableList } from 'immutable';
@ -11,10 +13,11 @@ import { TimelineHint } from 'mastodon/components/timeline_hint';
import BundleColumnError from 'mastodon/features/ui/components/bundle_column_error';
import { normalizeForLookup } from 'mastodon/reducers/accounts_map';
import { getAccountHidden } from 'mastodon/selectors';
import ColumnBackButtonSlim from '../../components/column_back_button_slim';
import { lookupAccount, fetchAccount } from '../../actions/accounts';
import { fetchFeaturedTags } from '../../actions/featured_tags';
import { expandAccountDirectTimeline} from '../../actions/timelines';
import ColumnBackButton from '../../components/column_back_button';
import { LoadingIndicator } from '../../components/loading_indicator';
import StatusList from '../../components/status_list';
import Column from '../ui/components/column';
@ -114,7 +117,7 @@ class AccountTimeline extends ImmutablePureComponent {
this._load();
} else if (prevProps.params.acct !== acct) {
dispatch(lookupAccount(acct));
}
}
}
handleLoadMore = maxId => {
@ -139,10 +142,10 @@ class AccountTimeline extends ImmutablePureComponent {
let emptyMessage;
const forceEmptyState = suspended || blockedBy || hidden || !signedIn
const forceEmptyState = suspended || blockedBy || hidden || !signedIn;
if (!signedIn) {
emptyMessage = <FormattedMessage id='empty_column.visitor' defaultMessage='Account suspended' />;
}
}
else if (suspended) {
emptyMessage = <FormattedMessage id='empty_column.account_suspended' defaultMessage='Account suspended' />;
} else if (blockedBy) {
@ -158,7 +161,7 @@ class AccountTimeline extends ImmutablePureComponent {
return (
<Column bindToDocument={!multiColumn} icon='thumb-tack' heading='-' ref={this.setRef}>
<ColumnBackButtonSlim />
<ColumnBackButton />
<StatusList
append={remoteMessage}
scrollKey='account_timeline'