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

Message when a profile is blocked changed

Browse source
This commit is contained in:
Sean King 2020-10-24 21:44:22 -06:00
parent 2104739f2c
commit d448277bbe
No known key found for this signature in database
GPG key ID: 510C52BACD6E7257
1 changed files with 13 additions and 2 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,11 +39,12 @@ const mapStateToProps = (state, { params: { username }, withReplies = false }) =
const path = withReplies ? `${accountId}:with_replies` : accountId;
const isBlocked = state.getIn(['relationships', accountId, 'blocked_by'], false);
const unavailable = (me === accountId) ? false : isBlocked;
const unavailable = (me === accountId) ? false : true;
return {
accountId,
unavailable,
isBlocked,
accountUsername,
accountApId,
isAccount: !!state.getIn(['accounts', accountId]),
@ -117,7 +118,7 @@ class AccountTimeline extends ImmutablePureComponent {
}
render() {
const { statusIds, featuredStatusIds, isLoading, hasMore, isAccount, accountId, unavailable, accountUsername } = this.props;
const { statusIds, featuredStatusIds, isLoading, hasMore, isAccount, accountId, isBlocked, unavailable, accountUsername } = this.props;
if (!isAccount && accountId !== -1) {
return (
@ -135,6 +136,16 @@ 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) {
return (
<Column>