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
				
			
		|  | @ -10,15 +10,7 @@ class AccountSearchService < BaseService | |||
|     @options = options | ||||
|     @account = account | ||||
| 
 | ||||
|     results = search_service_results | ||||
| 
 | ||||
|     unless account.nil? | ||||
|       account_ids    = results.map(&:id) | ||||
|       blocked_by_map = Account.blocked_by_map(account_ids, account.id) | ||||
|       results.reject! { |item| blocked_by_map[item.id] } | ||||
|     end | ||||
| 
 | ||||
|     results | ||||
|     search_service_results | ||||
|   end | ||||
| 
 | ||||
|   private | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue