mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
Fix following/followers API to return correct link headers (#3268)
Link headers in following/followers API should include follow_id as max_id/since_id. However, these API use current_user's account_id instead of follow_id from #3167. This causes irrelevant result on loading more users.
This commit is contained in:
parent
2ca1f0737a
commit
3ce9ca4c99
@ -23,14 +23,14 @@ class Api::V1::AccountsController < ApiController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def following
|
def following
|
||||||
@accounts = Account.includes(:followers)
|
@accounts = Account.includes(:passive_relationships)
|
||||||
.references(:followers)
|
.references(:passive_relationships)
|
||||||
.merge(Follow.where(account: @account)
|
.merge(Follow.where(account: @account)
|
||||||
.paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id]))
|
.paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id]))
|
||||||
.to_a
|
.to_a
|
||||||
|
|
||||||
next_path = following_api_v1_account_url(pagination_params(max_id: @accounts.last.followers.last.id)) if @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
|
next_path = following_api_v1_account_url(pagination_params(max_id: @accounts.last.passive_relationships.first.id)) if @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
|
||||||
prev_path = following_api_v1_account_url(pagination_params(since_id: @accounts.first.followers.first.id)) unless @accounts.empty?
|
prev_path = following_api_v1_account_url(pagination_params(since_id: @accounts.first.passive_relationships.first.id)) unless @accounts.empty?
|
||||||
|
|
||||||
set_pagination_headers(next_path, prev_path)
|
set_pagination_headers(next_path, prev_path)
|
||||||
|
|
||||||
@ -38,16 +38,16 @@ class Api::V1::AccountsController < ApiController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def followers
|
def followers
|
||||||
@accounts = Account.includes(:following)
|
@accounts = Account.includes(:active_relationships)
|
||||||
.references(:following)
|
.references(:active_relationships)
|
||||||
.merge(Follow.where(target_account: @account)
|
.merge(Follow.where(target_account: @account)
|
||||||
.paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT),
|
.paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT),
|
||||||
params[:max_id],
|
params[:max_id],
|
||||||
params[:since_id]))
|
params[:since_id]))
|
||||||
.to_a
|
.to_a
|
||||||
|
|
||||||
next_path = followers_api_v1_account_url(pagination_params(max_id: @accounts.last.following.last.id)) if @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
|
next_path = followers_api_v1_account_url(pagination_params(max_id: @accounts.last.active_relationships.first.id)) if @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
|
||||||
prev_path = followers_api_v1_account_url(pagination_params(since_id: @accounts.first.following.first.id)) unless @accounts.empty?
|
prev_path = followers_api_v1_account_url(pagination_params(since_id: @accounts.first.active_relationships.first.id)) unless @accounts.empty?
|
||||||
|
|
||||||
set_pagination_headers(next_path, prev_path)
|
set_pagination_headers(next_path, prev_path)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user