matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'snackbar-action-link'

Browse Source 
# Conflicts:
#   app/soapbox/features/edit_profile/index.js
This commit is contained in:
marcin mikołajczak
2022-02-01 08:27:38 +00:00
parent bf7cd98c03 c4c6e24c48
commit 8fed920bb7
45 changed files with 2168 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/soapbox/features/status/components/detailed_status.js
View File

@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { injectIntl } from 'react-intl';
import { FormattedMessage, injectIntl } from 'react-intl';
import { FormattedDate } from 'react-intl';
import { Link, NavLink } from 'react-router-dom';
@ -164,7 +164,15 @@ class DetailedStatus extends ImmutablePureComponent {
let quote;
if (status.get('quote')) {
quote = <QuotedStatus statusId={status.get('quote')} />;
if (status.getIn(['pleroma', 'quote_visible'], true) === false) {
quote = (
<div className='quoted-status-tombstone'>
<p><FormattedMessage id='statuses.quote_tombstone' defaultMessage='Post is unavailable.' /></p>
</div>
);
} else {
quote = <QuotedStatus statusId={status.get('quote')} />;
}
}
if (status.get('visibility') === 'direct') {