Improve blocked view of profiles (#10491)
* Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447)" This reverts commit 12054406. * Revert "Hide blocking accounts from blocked users (#10442)" This reverts commit 62bafa20. * 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
Showing
- app/controllers/api/v1/accounts/follower_accounts_controller.rb 6 additions, 2 deletions...ntrollers/api/v1/accounts/follower_accounts_controller.rb
- app/controllers/api/v1/accounts/following_accounts_controller.rb 6 additions, 2 deletions...trollers/api/v1/accounts/following_accounts_controller.rb
- app/controllers/api/v1/accounts/statuses_controller.rb 0 additions, 10 deletionsapp/controllers/api/v1/accounts/statuses_controller.rb
- app/controllers/api/v1/accounts_controller.rb 0 additions, 5 deletionsapp/controllers/api/v1/accounts_controller.rb
- app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb 0 additions, 1 deletion...lers/api/v1/statuses/favourited_by_accounts_controller.rb
- app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb 1 addition, 1 deletion...llers/api/v1/statuses/reblogged_by_accounts_controller.rb
- app/helpers/stream_entries_helper.rb 1 addition, 1 deletionapp/helpers/stream_entries_helper.rb
- app/javascript/mastodon/features/account/components/header.js 1 addition, 1 deletion...javascript/mastodon/features/account/components/header.js
- app/javascript/mastodon/features/account_timeline/index.js 16 additions, 6 deletionsapp/javascript/mastodon/features/account_timeline/index.js
- app/javascript/mastodon/features/followers/index.js 5 additions, 3 deletionsapp/javascript/mastodon/features/followers/index.js
- app/javascript/mastodon/features/following/index.js 5 additions, 3 deletionsapp/javascript/mastodon/features/following/index.js
- app/javascript/styles/mastodon/components.scss 2 additions, 1 deletionapp/javascript/styles/mastodon/components.scss
- app/javascript/styles/mastodon/stream_entries.scss 17 additions, 0 deletionsapp/javascript/styles/mastodon/stream_entries.scss
- app/models/account.rb 0 additions, 1 deletionapp/models/account.rb
- app/presenters/account_relationships_presenter.rb 5 additions, 1 deletionapp/presenters/account_relationships_presenter.rb
- app/serializers/rest/relationship_serializer.rb 5 additions, 1 deletionapp/serializers/rest/relationship_serializer.rb
- app/services/account_search_service.rb 1 addition, 9 deletionsapp/services/account_search_service.rb
- app/services/search_service.rb 0 additions, 2 deletionsapp/services/search_service.rb
- app/views/accounts/show.html.haml 3 additions, 1 deletionapp/views/accounts/show.html.haml
- app/views/follower_accounts/index.html.haml 2 additions, 0 deletionsapp/views/follower_accounts/index.html.haml
Loading
Please register or sign in to comment