Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Allow viewing and severing relationships with suspended accounts (#27667)

Browse source
This commit is contained in:
Claire 2023-11-09 15:50:25 +01:00 • committed by GitHub
parent b87bfb8c96
commit c451bbe249
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 157 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,10 +5,11 @@ class Api::V1::Accounts::RelationshipsController < Api::BaseController
before_action :require_user!
def index
accounts = Account.without_suspended.where(id: account_ids).select('id')
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 = accounts.index_by(&:id).values_at(*account_ids).compact
@accounts = scope.index_by(&:id).values_at(*account_ids).compact
render json: @accounts, each_serializer: REST::RelationshipSerializer, relationships: relationships
end