From: abcang Date: Sun, 4 Feb 2018 11:32:10 +0000 (+0900) Subject: Exclude nil from relationships array (#6427) X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3f35d4322266ee6f1bfab73a1161af2b0848573a;p=mastodon.git Exclude nil from relationships array (#6427) --- diff --git a/app/controllers/api/v1/accounts/relationships_controller.rb b/app/controllers/api/v1/accounts/relationships_controller.rb index 91a942d75..6cc3da498 100644 --- a/app/controllers/api/v1/accounts/relationships_controller.rb +++ b/app/controllers/api/v1/accounts/relationships_controller.rb @@ -10,7 +10,7 @@ class Api::V1::Accounts::RelationshipsController < Api::BaseController accounts = Account.where(id: account_ids).select('id') # .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) + @accounts = accounts.index_by(&:id).values_at(*account_ids).compact render json: @accounts, each_serializer: REST::RelationshipSerializer, relationships: relationships end