Conflicts: - `.github/dependabot.yml`: Updated upstream, removed in glitch-soc to disable noise. Kept removed. - `CODE_OF_CONDUCT.md`: Upstream updated to a new version of the covenant, but I have not read it yet, so kept unchanged. - `Gemfile.lock`: Not a real conflict, one upstream dependency updated textually too close to the glitch-soc only `hcaptcha` dependency. Applied upstream changes. - `app/controllers/admin/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/disputes/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/relationships_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/statuses_cleanup_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/helpers/application_helper.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream added a highlight animation for onboarding, while we changed the max character limit. Applied our local changes on top of upstream's new version. - `app/views/layouts/application.html.haml`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `stylelint.config.js`: Upstream added ignore paths, glitch-soc had extra ignore paths. Added the same paths as upstream.
		
			
				
	
	
		
			71 lines
		
	
	
	
		
			1.8 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			71 lines
		
	
	
	
		
			1.8 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
# frozen_string_literal: true
 | 
						|
 | 
						|
class Api::V1::Timelines::PublicController < Api::BaseController
 | 
						|
  before_action :require_user!, only: [:show], if: :require_auth?
 | 
						|
  after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
 | 
						|
 | 
						|
  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 insert_pagination_headers
 | 
						|
    set_pagination_headers(next_path, prev_path)
 | 
						|
  end
 | 
						|
 | 
						|
  def pagination_params(core_params)
 | 
						|
    params.slice(:local, :remote, :limit, :only_media, :allow_local_only).permit(:local, :remote, :limit, :only_media, :allow_local_only).merge(core_params)
 | 
						|
  end
 | 
						|
 | 
						|
  def next_path
 | 
						|
    api_v1_timelines_public_url pagination_params(max_id: pagination_max_id)
 | 
						|
  end
 | 
						|
 | 
						|
  def prev_path
 | 
						|
    api_v1_timelines_public_url pagination_params(min_id: pagination_since_id)
 | 
						|
  end
 | 
						|
 | 
						|
  def pagination_max_id
 | 
						|
    @statuses.last.id
 | 
						|
  end
 | 
						|
 | 
						|
  def pagination_since_id
 | 
						|
    @statuses.first.id
 | 
						|
  end
 | 
						|
end
 |