Add scope Status.distributable_visibility (#29950)
		
	This commit is contained in:
		
					parent
					
						
							
								0622107449
							
						
					
				
			
			
				commit
				
					
						caad1e2628
					
				
			
		
					 9 changed files with 9 additions and 8 deletions
				
			
		|  | @ -46,7 +46,7 @@ class AccountsController < ApplicationController | |||
|   end | ||||
| 
 | ||||
|   def default_statuses | ||||
|     @account.statuses.where(visibility: [:public, :unlisted]) | ||||
|     @account.statuses.distributable_visibility | ||||
|   end | ||||
| 
 | ||||
|   def only_media_scope | ||||
|  |  | |||
|  | @ -31,7 +31,7 @@ class ActivityPub::RepliesController < ActivityPub::BaseController | |||
| 
 | ||||
|   def set_replies | ||||
|     @replies = only_other_accounts? ? Status.where.not(account_id: @account.id).joins(:account).merge(Account.without_suspended) : @account.statuses | ||||
|     @replies = @replies.where(in_reply_to_id: @status.id, visibility: [:public, :unlisted]) | ||||
|     @replies = @replies.distributable_visibility.where(in_reply_to_id: @status.id) | ||||
|     @replies = @replies.paginate_by_min_id(DESCENDANTS_LIMIT, params[:min_id]) | ||||
|   end | ||||
| 
 | ||||
|  |  | |||
|  | @ -23,7 +23,7 @@ class Api::V1::Statuses::RebloggedByAccountsController < Api::V1::Statuses::Base | |||
|   end | ||||
| 
 | ||||
|   def paginated_statuses | ||||
|     Status.where(reblog_of_id: @status.id).where(visibility: [:public, :unlisted]).paginate_by_max_id( | ||||
|     Status.where(reblog_of_id: @status.id).distributable_visibility.paginate_by_max_id( | ||||
|       limit_param(DEFAULT_ACCOUNTS_LIMIT), | ||||
|       params[:max_id], | ||||
|       params[:since_id] | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue