API pagination for all collections using Link header
This commit is contained in:
parent
8d7fc5da6c
commit
b13e7dda1f
13 changed files with 123 additions and 63 deletions
|
@ -4,7 +4,7 @@ class Api::V1::AccountsController < ApiController
|
|||
before_action :require_user!, except: [:show, :following, :followers, :statuses]
|
||||
before_action :set_account, except: [:verify_credentials, :suggestions]
|
||||
|
||||
respond_to :json
|
||||
respond_to :json
|
||||
|
||||
def show
|
||||
end
|
||||
|
@ -15,12 +15,26 @@ class Api::V1::AccountsController < ApiController
|
|||
end
|
||||
|
||||
def following
|
||||
@accounts = @account.following.with_counters.limit(40)
|
||||
results = Follow.where(account: @account).paginate_by_max_id(DEFAULT_ACCOUNTS_LIMIT, params[:max_id], params[:since_id])
|
||||
@accounts = Account.where(id: results.map(&:account_id)).with_counters.to_a
|
||||
|
||||
next_path = following_api_v1_account_url(max_id: results.last.id) if results.size == DEFAULT_ACCOUNTS_LIMIT
|
||||
prev_path = following_api_v1_account_url(since_id: results.first.id) if results.size > 0
|
||||
|
||||
set_pagination_headers(next_path, prev_path)
|
||||
|
||||
render action: :index
|
||||
end
|
||||
|
||||
def followers
|
||||
@accounts = @account.followers.with_counters.limit(40)
|
||||
results = Follow.where(target_account: @account).paginate_by_max_id(DEFAULT_ACCOUNTS_LIMIT, params[:max_id], params[:since_id])
|
||||
@accounts = Account.where(id: results.map(&:account_id)).with_counters.to_a
|
||||
|
||||
next_path = following_api_v1_account_url(max_id: results.last.id) if results.size == DEFAULT_ACCOUNTS_LIMIT
|
||||
prev_path = following_api_v1_account_url(since_id: results.first.id) if results.size > 0
|
||||
|
||||
set_pagination_headers(next_path, prev_path)
|
||||
|
||||
render action: :index
|
||||
end
|
||||
|
||||
|
@ -35,8 +49,14 @@ class Api::V1::AccountsController < ApiController
|
|||
end
|
||||
|
||||
def statuses
|
||||
@statuses = @account.statuses.with_includes.with_counters.paginate_by_max_id(20, params[:max_id], params[:since_id]).to_a
|
||||
@statuses = @account.statuses.with_includes.with_counters.paginate_by_max_id(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id]).to_a
|
||||
|
||||
set_maps(@statuses)
|
||||
|
||||
next_path = statuses_api_v1_account_url(max_id: @statuses.last.id) if @statuses.size == DEFAULT_STATUSES_LIMIT
|
||||
prev_path = statuses_api_v1_account_url(since_id: @statuses.first.id) if @statuses.size > 0
|
||||
|
||||
set_pagination_headers(next_path, prev_path)
|
||||
end
|
||||
|
||||
def follow
|
||||
|
|
|
@ -2,7 +2,7 @@ class Api::V1::FollowsController < ApiController
|
|||
before_action -> { doorkeeper_authorize! :follow }
|
||||
before_action :require_user!
|
||||
|
||||
respond_to :json
|
||||
respond_to :json
|
||||
|
||||
def create
|
||||
raise ActiveRecord::RecordNotFound if params[:uri].blank?
|
||||
|
|
|
@ -2,7 +2,7 @@ class Api::V1::MediaController < ApiController
|
|||
before_action -> { doorkeeper_authorize! :write }
|
||||
before_action :require_user!
|
||||
|
||||
respond_to :json
|
||||
respond_to :json
|
||||
|
||||
def create
|
||||
@media = MediaAttachment.create!(account: current_user.account, file: params[:file])
|
||||
|
|
|
@ -15,12 +15,26 @@ class Api::V1::StatusesController < ApiController
|
|||
end
|
||||
|
||||
def reblogged_by
|
||||
@accounts = @status.reblogged_by(40)
|
||||
results = @status.reblogs.paginate_by_max_id(DEFAULT_ACCOUNTS_LIMIT, params[:max_id], params[:since_id])
|
||||
@accounts = Account.where(id: results.map(&:account_id)).with_counters.to_a
|
||||
|
||||
next_path = reblogged_by_api_v1_status_url(max_id: results.last.id) if results.size == DEFAULT_ACCOUNTS_LIMIT
|
||||
prev_path = reblogged_by_api_v1_status_url(since_id: results.first.id) if results.size > 0
|
||||
|
||||
set_pagination_headers(next_path, prev_path)
|
||||
|
||||
render action: :accounts
|
||||
end
|
||||
|
||||
def favourited_by
|
||||
@accounts = @status.favourited_by(40)
|
||||
results = @status.favourites.paginate_by_max_id(DEFAULT_ACCOUNTS_LIMIT, params[:max_id], params[:since_id])
|
||||
@accounts = Account.where(id: results.map(&:account_id)).with_counters.to_a
|
||||
|
||||
next_path = favourited_by_api_v1_status_url(max_id: results.last.id) if results.size == DEFAULT_ACCOUNTS_LIMIT
|
||||
prev_path = favourited_by_api_v1_status_url(since_id: results.first.id) if results.size > 0
|
||||
|
||||
set_pagination_headers(next_path, prev_path)
|
||||
|
||||
render action: :accounts
|
||||
end
|
||||
|
||||
|
|
|
@ -5,32 +5,54 @@ class Api::V1::TimelinesController < ApiController
|
|||
respond_to :json
|
||||
|
||||
def home
|
||||
@statuses = Feed.new(:home, current_account).get(20, params[:max_id], params[:since_id]).to_a
|
||||
@statuses = Feed.new(:home, current_account).get(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id]).to_a
|
||||
|
||||
set_maps(@statuses)
|
||||
|
||||
next_path = api_v1_home_timeline_url(max_id: @statuses.last.id) if @statuses.size == DEFAULT_STATUSES_LIMIT
|
||||
prev_path = api_v1_home_timeline_url(since_id: @statuses.first.id) if @statuses.size > 0
|
||||
|
||||
set_pagination_headers(next_path, prev_path)
|
||||
|
||||
render action: :index
|
||||
end
|
||||
|
||||
def mentions
|
||||
@statuses = Feed.new(:mentions, current_account).get(20, params[:max_id], params[:since_id]).to_a
|
||||
@statuses = Feed.new(:mentions, current_account).get(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id]).to_a
|
||||
|
||||
set_maps(@statuses)
|
||||
|
||||
next_path = api_v1_mentions_timeline_url(max_id: @statuses.last.id) if @statuses.size == DEFAULT_STATUSES_LIMIT
|
||||
prev_path = api_v1_mentions_timeline_url(since_id: @statuses.first.id) if @statuses.size > 0
|
||||
|
||||
set_pagination_headers(next_path, prev_path)
|
||||
|
||||
render action: :index
|
||||
end
|
||||
|
||||
def public
|
||||
@statuses = Status.as_public_timeline(current_account).paginate_by_max_id(20, params[:max_id], params[:since_id]).to_a
|
||||
@statuses = Status.as_public_timeline(current_account).paginate_by_max_id(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id]).to_a
|
||||
|
||||
set_maps(@statuses)
|
||||
|
||||
next_path = api_v1_public_timeline_url(max_id: @statuses.last.id) if @statuses.size == DEFAULT_STATUSES_LIMIT
|
||||
prev_path = api_v1_public_timeline_url(since_id: @statuses.first.id) if @statuses.size > 0
|
||||
|
||||
set_pagination_headers(next_path, prev_path)
|
||||
|
||||
render action: :index
|
||||
end
|
||||
|
||||
def tag
|
||||
@tag = Tag.find_by(name: params[:id].downcase)
|
||||
@tag = Tag.find_by(name: params[:id].downcase)
|
||||
@statuses = @tag.nil? ? [] : Status.as_tag_timeline(@tag, current_account).paginate_by_max_id(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id]).to_a
|
||||
|
||||
if @tag.nil?
|
||||
@statuses = []
|
||||
else
|
||||
@statuses = Status.as_tag_timeline(@tag, current_account).paginate_by_max_id(20, params[:max_id], params[:since_id]).to_a
|
||||
set_maps(@statuses)
|
||||
end
|
||||
set_maps(@statuses)
|
||||
|
||||
next_path = api_v1_hashtag_timeline_url(params[:id], max_id: @statuses.last.id) if @statuses.size == DEFAULT_STATUSES_LIMIT
|
||||
prev_path = api_v1_hashtag_timeline_url(params[:id], since_id: @statuses.first.id) if @statuses.size > 0
|
||||
|
||||
set_pagination_headers(next_path, prev_path)
|
||||
|
||||
render action: :index
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue