diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-04-07 04:59:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-07 04:59:13 +0200 |
| commit | 67b3b62b98b89f24097a2757e42bc94f1bce123c (patch) | |
| tree | 4d2b100537676e349c8d9863e6ae600cf7ac7219 /app/views/following_accounts | |
| parent | 0e8819f0e8729cda54231ed7a76dd10eb2083bdf (diff) | |
Improve blocked view of profiles (#10491)
* Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447)" This reverts commit 120544067fcca4bf6e71ba1ffb276c451c17c656. * Revert "Hide blocking accounts from blocked users (#10442)" This reverts commit 62bafa20a112ccdddaedb25723fc819dbbcd8e9a. * Improve blocked view of profiles - Change "You are blocked" to "Profile unavailable" - Hide following/followers in API when blocked - Disable follow button and show "Profile unavailable" on public profile as well
Diffstat (limited to 'app/views/following_accounts')
| -rw-r--r-- | app/views/following_accounts/index.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/following_accounts/index.html.haml b/app/views/following_accounts/index.html.haml index 8b49b529b..17fe79018 100644 --- a/app/views/following_accounts/index.html.haml +++ b/app/views/following_accounts/index.html.haml @@ -9,6 +9,8 @@ - if @account.user_hides_network? .nothing-here= t('accounts.network_hidden') +- elsif user_signed_in? && @account.blocking?(current_account) + .nothing-here= t('accounts.unavailable') - elsif @follows.empty? = nothing_here - else |