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

"Profile unavailable" only if blocked, fixes #96

Browse source
This commit is contained in:
Alex Gleason 2020-06-11 23:42:05 -05:00
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 Expand all files Collapse all files

4
app/soapbox/features/account_gallery/index.js
View file

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

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

@ -34,9 +34,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 isLocked = state.getIn(['accounts', accountId, 'locked'], false); const unavailable = (me === accountId) ? false : isBlocked;
const isFollowing = state.getIn(['relationships', accountId, 'following'], false);
const unavailable = (me === accountId) ? false : (isBlocked || (isLocked && !isFollowing));
return { return {
accountId, accountId,

4
app/soapbox/features/followers/index.js
View file

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

4
app/soapbox/features/following/index.js
View file

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