Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Deduplicate IDs in relationships and familiar_followers APIs (#27982)

Browse source
This commit is contained in:
Kevin Bongart 2023-11-23 05:00:09 -05:00 • committed by GitHub
parent 973597c6f1
commit 7877fcd83c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/api/v1/accounts/familiar_followers_controller.rb
View file

@ -12,7 +12,7 @@ class Api::V1::Accounts::FamiliarFollowersController < Api::BaseController
private
def set_accounts
@accounts = Account.without_suspended.where(id: account_ids).select('id, hide_collections').index_by(&:id).values_at(*account_ids).compact
@accounts = Account.without_suspended.where(id: account_ids).select('id, hide_collections')
end
def familiar_followers

7
app/controllers/api/v1/accounts/relationships_controller.rb
View file

@ -5,11 +5,8 @@ class Api::V1::Accounts::RelationshipsController < Api::BaseController
before_action :require_user!
def index
scope = Account.where(id: account_ids).select('id')
scope.merge!(Account.without_suspended) unless truthy_param?(:with_suspended)
# .where doesn't guarantee that our results are in the same order
# we requested them, so return the "right" order to the requestor.
@accounts = scope.index_by(&:id).values_at(*account_ids).compact
@accounts = Account.where(id: account_ids).select('id')
@accounts.merge!(Account.without_suspended) unless truthy_param?(:with_suspended)
render json: @accounts, each_serializer: REST::RelationshipSerializer, relationships: relationships
end