* Make /api/v1/timelines/public and /api/v1/timelines/tag/:id public Fix #1156 - respect query params when generating pagination links in API * Apply pagination fix to more APIs
		
			
				
	
	
		
			61 lines
		
	
	
	
		
			2.1 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			61 lines
		
	
	
	
		
			2.1 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
| # frozen_string_literal: true
 | |
| 
 | |
| class Api::V1::TimelinesController < ApiController
 | |
|   before_action -> { doorkeeper_authorize! :read }, only: [:home]
 | |
|   before_action :require_user!, only: [:home]
 | |
| 
 | |
|   respond_to :json
 | |
| 
 | |
|   def home
 | |
|     @statuses = Feed.new(:home, current_account).get(limit_param(DEFAULT_STATUSES_LIMIT), params[:max_id], params[:since_id])
 | |
|     @statuses = cache_collection(@statuses)
 | |
| 
 | |
|     set_maps(@statuses)
 | |
| 
 | |
|     next_path = api_v1_home_timeline_url(pagination_params(max_id: @statuses.last.id))    unless @statuses.empty?
 | |
|     prev_path = api_v1_home_timeline_url(pagination_params(since_id: @statuses.first.id)) unless @statuses.empty?
 | |
| 
 | |
|     set_pagination_headers(next_path, prev_path)
 | |
| 
 | |
|     render action: :index
 | |
|   end
 | |
| 
 | |
|   def public
 | |
|     @statuses = Status.as_public_timeline(current_account, params[:local]).paginate_by_max_id(limit_param(DEFAULT_STATUSES_LIMIT), params[:max_id], params[:since_id])
 | |
|     @statuses = cache_collection(@statuses)
 | |
| 
 | |
|     set_maps(@statuses)
 | |
| 
 | |
|     next_path = api_v1_public_timeline_url(pagination_params(max_id: @statuses.last.id))    unless @statuses.empty?
 | |
|     prev_path = api_v1_public_timeline_url(pagination_params(since_id: @statuses.first.id)) unless @statuses.empty?
 | |
| 
 | |
|     set_pagination_headers(next_path, prev_path)
 | |
| 
 | |
|     render action: :index
 | |
|   end
 | |
| 
 | |
|   def tag
 | |
|     @tag      = Tag.find_by(name: params[:id].downcase)
 | |
|     @statuses = @tag.nil? ? [] : Status.as_tag_timeline(@tag, current_account, params[:local]).paginate_by_max_id(limit_param(DEFAULT_STATUSES_LIMIT), params[:max_id], params[:since_id])
 | |
|     @statuses = cache_collection(@statuses)
 | |
| 
 | |
|     set_maps(@statuses)
 | |
| 
 | |
|     next_path = api_v1_hashtag_timeline_url(params[:id], pagination_params(max_id: @statuses.last.id))    unless @statuses.empty?
 | |
|     prev_path = api_v1_hashtag_timeline_url(params[:id], pagination_params(since_id: @statuses.first.id)) unless @statuses.empty?
 | |
| 
 | |
|     set_pagination_headers(next_path, prev_path)
 | |
| 
 | |
|     render action: :index
 | |
|   end
 | |
| 
 | |
|   private
 | |
| 
 | |
|   def cache_collection(raw)
 | |
|     super(raw, Status)
 | |
|   end
 | |
| 
 | |
|   def pagination_params(core_params)
 | |
|     params.permit(:local, :limit).merge(core_params)
 | |
|   end
 | |
| end
 |