Improve blocked view of profiles (#10491)
* Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447)" This reverts commit120544067f. * Revert "Hide blocking accounts from blocked users (#10442)" This reverts commit62bafa20a1. * 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
This commit is contained in:
		
					parent
					
						
							
								0e8819f0e8
							
						
					
				
			
			
				commit
				
					
						67b3b62b98
					
				
			
		
					 26 changed files with 97 additions and 138 deletions
				
			
		|  | @ -22,7 +22,6 @@ class Api::V1::Statuses::FavouritedByAccountsController < Api::BaseController | |||
| 
 | ||||
|   def default_accounts | ||||
|     Account | ||||
|       .without_blocking(current_account) | ||||
|       .includes(:favourites, :account_stat) | ||||
|       .references(:favourites) | ||||
|       .where(favourites: { status_id: @status.id }) | ||||
|  |  | |||
|  | @ -21,7 +21,7 @@ class Api::V1::Statuses::RebloggedByAccountsController < Api::BaseController | |||
|   end | ||||
| 
 | ||||
|   def default_accounts | ||||
|     Account.without_blocking(current_account).includes(:statuses, :account_stat).references(:statuses) | ||||
|     Account.includes(:statuses, :account_stat).references(:statuses) | ||||
|   end | ||||
| 
 | ||||
|   def paginated_statuses | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue