moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'quote-posts-tombstones' into 'develop' 

Add quoted status tombstone

See merge request soapbox-pub/soapbox-fe!1009
This commit is contained in:
marcin mikołajczak 2022-01-27 23:07:14 +00:00
parent f0051b7bbc ae7f2f86a0
commit 7bb404207a
3 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/soapbox/components/status.js
View File

@ -477,8 +477,16 @@ class Status extends ImmutablePureComponent {
let quote; let quote;
if (status.get('quote')) { if (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')} />; quote = <QuotedStatus statusId={status.get('quote')} />;
} }
}
if (otherAccounts && otherAccounts.size > 1) { if (otherAccounts && otherAccounts.size > 1) {
statusAvatar = <AvatarComposite accounts={otherAccounts} size={48} />; statusAvatar = <AvatarComposite accounts={otherAccounts} size={48} />;

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

@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import React from 'react'; import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePureComponent from 'react-immutable-pure-component';
import { injectIntl } from 'react-intl'; import { FormattedMessage, injectIntl } from 'react-intl';
import { FormattedDate } from 'react-intl'; import { FormattedDate } from 'react-intl';
import { Link, NavLink } from 'react-router-dom'; import { Link, NavLink } from 'react-router-dom';
@ -164,8 +164,16 @@ class DetailedStatus extends ImmutablePureComponent {
let quote; let quote;
if (status.get('quote')) { if (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')} />; quote = <QuotedStatus statusId={status.get('quote')} />;
} }
}
if (status.get('visibility') === 'direct') { if (status.get('visibility') === 'direct') {
statusTypeIcon = <Icon src={require('@tabler/icons/icons/mail.svg')} />; statusTypeIcon = <Icon src={require('@tabler/icons/icons/mail.svg')} />;

10
app/styles/components/status.scss
View File

@ -820,4 +820,14 @@ a.status-card.compact:hover {
.attachment-thumbs .media-gallery { .attachment-thumbs .media-gallery {
margin-top: 5px !important; margin-top: 5px !important;
} }
&-tombstone {
margin-top: 14px;
padding: 12px;
border: 1px solid var(--brand-color--med);
border-radius: 10px;
color: var(--primary-text-color--faint);
font-size: 14px;
text-align: center;
}
} }