bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

A better way to handle block messages

Browse source
This commit is contained in:
Sean King 2020-11-02 08:25:21 -07:00
parent d448277bbe
commit 3d393deee4
No known key found for this signature in database
GPG key ID: 510C52BACD6E7257
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/soapbox/features/account_timeline/index.js
View file

@ -39,7 +39,7 @@ const mapStateToProps = (state, { params: { username }, withReplies = false }) =
const path = withReplies ? `${accountId}:with_replies` : accountId; const path = withReplies ? `${accountId}:with_replies` : accountId;
const isBlocked = state.getIn(['relationships', accountId, 'blocked_by'], false); const isBlocked = state.getIn(['relationships', accountId, 'blocked_by'], false);
const unavailable = (me === accountId) ? false : true; const unavailable = (me === accountId) ? false : isBlocked;
return { return {
accountId, accountId,
@ -136,21 +136,12 @@ class AccountTimeline extends ImmutablePureComponent {
); );
} }
if (isBlocked) {
return (
<Column>
<div className='empty-column-indicator'>
<FormattedMessage id='empty_column.account_blocked' defaultMessage='You are blocked by @{accountUsername}.' values={{ accountUsername: accountUsername }} />
</div>
</Column>
);
}
if (unavailable) { if (unavailable) {
return ( return (
<Column> <Column>
<div className='empty-column-indicator'> <div className='empty-column-indicator'>
<FormattedMessage id='empty_column.account_unavailable' defaultMessage='Profile unavailable' /> {isBlocked ? <FormattedMessage id='empty_column.account_blocked' defaultMessage='You are blocked by @{accountUsername}.' values={{ accountUsername: accountUsername }} />
: <FormattedMessage id='empty_column.account_unavailable' defaultMessage='Profile unavailable' />}
</div> </div>
</Column> </Column>
); );