mirror_maker
/
soapbox
mirror of https://gitlab.com/soapbox-pub/soapbox
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

"Profile unavailable" only if blocked, fixes #96

Browse Source
merge-requests/70/head
Alex Gleason 4 years ago
parent 463a2b7b2d
commit e101afd619
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File

4
app/soapbox/features/account_gallery/index.js
Unescape View File

@ -34,9 +34,7 @@ const mapStateToProps = (state, { params: { username }, withReplies = false }) =
}
const isBlocked = state.getIn(['relationships', accountId, 'blocked_by'], false);
const isLocked = state.getIn(['accounts', accountId, 'locked'], false);
const isFollowing = state.getIn(['relationships', accountId, 'following'], false);
const unavailable = (me === accountId) ? false : (isBlocked || (isLocked && !isFollowing));
const unavailable = (me === accountId) ? false : isBlocked;
return {
accountId,

4
app/soapbox/features/account_timeline/index.js
Unescape View File

@ -34,9 +34,7 @@ const mapStateToProps = (state, { params: { username }, withReplies = false }) =
const path = withReplies ? `${accountId}:with_replies` : accountId;
const isBlocked = state.getIn(['relationships', accountId, 'blocked_by'], false);
const isLocked = state.getIn(['accounts', accountId, 'locked'], false);
const isFollowing = state.getIn(['relationships', accountId, 'following'], false);
const unavailable = (me === accountId) ? false : (isBlocked || (isLocked && !isFollowing));
const unavailable = (me === accountId) ? false : isBlocked;
return {
accountId,

4
app/soapbox/features/followers/index.js
Unescape View File

@ -33,9 +33,7 @@ const mapStateToProps = (state, { params: { username }, withReplies = false }) =
const diffCount = getFollowDifference(state, accountId, 'followers');
const isBlocked = state.getIn(['relationships', accountId, 'blocked_by'], false);
const isLocked = state.getIn(['accounts', accountId, 'locked'], false);
const isFollowing = state.getIn(['relationships', accountId, 'following'], false);
const unavailable = (me === accountId) ? false : (isBlocked || (isLocked && !isFollowing));
const unavailable = (me === accountId) ? false : isBlocked;
return {
accountId,

4
app/soapbox/features/following/index.js
Unescape View File

@ -33,9 +33,7 @@ const mapStateToProps = (state, { params: { username }, withReplies = false }) =
const diffCount = getFollowDifference(state, accountId, 'following');
const isBlocked = state.getIn(['relationships', accountId, 'blocked_by'], false);
const isLocked = state.getIn(['accounts', accountId, 'locked'], false);
const isFollowing = state.getIn(['relationships', accountId, 'following'], false);
const unavailable = (me === accountId) ? false : (isBlocked || (isLocked && !isFollowing));
const unavailable = (me === accountId) ? false : isBlocked;
return {
accountId,

Write Preview
Loading…
Cancel
Save