Conflicts: - `app/controllers/api/v1/timelines/public_controller.rb`: Upstream refactored this code, the conflict was because of an extra supported parameter, `allow_local_only`. Updated the controller to follow upstream's refactor, and moved the extra parameter definition accordingly.
		
			
				
	
	
		
			56 lines
		
	
	
	
		
			1.4 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			56 lines
		
	
	
	
		
			1.4 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
# frozen_string_literal: true
 | 
						|
 | 
						|
class Api::V1::Timelines::PublicController < Api::V1::Timelines::BaseController
 | 
						|
  before_action :require_user!, only: [:show], if: :require_auth?
 | 
						|
 | 
						|
  PERMITTED_PARAMS = %i(local remote limit only_media allow_local_only).freeze
 | 
						|
 | 
						|
  def show
 | 
						|
    cache_if_unauthenticated!
 | 
						|
    @statuses = load_statuses
 | 
						|
    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
 | 
						|
  end
 | 
						|
 | 
						|
  private
 | 
						|
 | 
						|
  def require_auth?
 | 
						|
    !Setting.timeline_preview
 | 
						|
  end
 | 
						|
 | 
						|
  def load_statuses
 | 
						|
    cached_public_statuses_page
 | 
						|
  end
 | 
						|
 | 
						|
  def cached_public_statuses_page
 | 
						|
    cache_collection(public_statuses, Status)
 | 
						|
  end
 | 
						|
 | 
						|
  def public_statuses
 | 
						|
    public_feed.get(
 | 
						|
      limit_param(DEFAULT_STATUSES_LIMIT),
 | 
						|
      params[:max_id],
 | 
						|
      params[:since_id],
 | 
						|
      params[:min_id]
 | 
						|
    )
 | 
						|
  end
 | 
						|
 | 
						|
  def public_feed
 | 
						|
    PublicFeed.new(
 | 
						|
      current_account,
 | 
						|
      local: truthy_param?(:local),
 | 
						|
      remote: truthy_param?(:remote),
 | 
						|
      only_media: truthy_param?(:only_media),
 | 
						|
      allow_local_only: truthy_param?(:allow_local_only),
 | 
						|
      with_replies: Setting.show_replies_in_public_timelines,
 | 
						|
      with_reblogs: Setting.show_reblogs_in_public_timelines
 | 
						|
    )
 | 
						|
  end
 | 
						|
 | 
						|
  def next_path
 | 
						|
    api_v1_timelines_public_url next_path_params
 | 
						|
  end
 | 
						|
 | 
						|
  def prev_path
 | 
						|
    api_v1_timelines_public_url prev_path_params
 | 
						|
  end
 | 
						|
end
 |