fix quote 500 error
This commit is contained in:
parent
d342d103ba
commit
d89bff03c9
@ -9,10 +9,11 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
|
||||
def index
|
||||
cache_if_unauthenticated!
|
||||
@statuses = load_statuses
|
||||
account_ids = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
|
||||
account?ids = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
|
||||
accounts = Account.where(id: account_ids)
|
||||
render json: @statuses, each_serializer: REST::StatusSerializer,
|
||||
relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id),
|
||||
account_relationships: AccountRelationshipsPresenter.new(account_ids, current_user&.account_id)
|
||||
account_relationships: AccountRelationshipsPresenter.new(accounts, current_user&.account_id)
|
||||
end
|
||||
|
||||
private
|
||||
|
@ -8,9 +8,10 @@ class Api::V1::BookmarksController < Api::BaseController
|
||||
def index
|
||||
@statuses = load_statuses
|
||||
account_ids = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
|
||||
accounts = Account.where(id: account_ids)
|
||||
render json: @statuses, each_serializer: REST::StatusSerializer,
|
||||
relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id),
|
||||
account_relationships: AccountRelationshipsPresenter.new(account_ids, current_user&.account_id)
|
||||
account_relationships: AccountRelationshipsPresenter.new(accounts, current_user&.account_id)
|
||||
end
|
||||
|
||||
private
|
||||
|
@ -8,9 +8,10 @@ class Api::V1::FavouritesController < Api::BaseController
|
||||
def index
|
||||
@statuses = load_statuses
|
||||
account_ids = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
|
||||
accounts = Account.where(id: account_ids)
|
||||
render json: @statuses, each_serializer: REST::StatusSerializer,
|
||||
relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id),
|
||||
account_relationships: AccountRelationshipsPresenter.new(account_ids, current_user&.account_id)
|
||||
account_relationships: AccountRelationshipsPresenter.new(accounts, current_user&.account_id)
|
||||
end
|
||||
|
||||
private
|
||||
|
@ -50,10 +50,11 @@ class Api::V1::StatusesController < Api::BaseController
|
||||
@context = Context.new(ancestors: loaded_ancestors, descendants: loaded_descendants)
|
||||
statuses = [@status] + @context.ancestors + @context.descendants
|
||||
account_ids = statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
|
||||
accounts = Account.where(id: account_ids)
|
||||
|
||||
render json: @context, serializer: REST::ContextSerializer,
|
||||
relationships: StatusRelationshipsPresenter.new(statuses, current_user&.account_id),
|
||||
account_relationships: AccountRelationshipsPresenter.new(account_ids, current_user&.account_id)
|
||||
account_relationships: AccountRelationshipsPresenter.new(accounts, current_user&.account_id)
|
||||
end
|
||||
|
||||
def create
|
||||
|
@ -11,7 +11,9 @@ class Api::V1::Timelines::HomeController < Api::V1::Timelines::BaseController
|
||||
@statuses = load_statuses
|
||||
@relationships = StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
|
||||
account_ids = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
|
||||
@account_relationships = AccountRelationshipsPresenter.new(account_ids, current_user&.account_id)
|
||||
accounts = Account.where(id: account_ids)
|
||||
|
||||
@account_relationships = AccountRelationshipsPresenter.new(accounts, current_user&.account_id)
|
||||
end
|
||||
|
||||
render json: @statuses,
|
||||
|
@ -10,11 +10,12 @@ class Api::V1::Timelines::ListController < Api::V1::Timelines::BaseController
|
||||
|
||||
def show
|
||||
account_ids = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
|
||||
accounts = Account.where(id: account_ids)
|
||||
|
||||
render json: @statuses,
|
||||
each_serializer: REST::StatusSerializer,
|
||||
relationships: StatusRelationshipsPresenter.new(@statuses, current_user.account_id),
|
||||
account_relationships: AccountRelationshipsPresenter.new(account_ids, current_user&.account_id)
|
||||
account_relationships: AccountRelationshipsPresenter.new(accounts, current_user&.account_id)
|
||||
end
|
||||
|
||||
private
|
||||
|
@ -9,10 +9,11 @@ class Api::V1::Timelines::PublicController < Api::V1::Timelines::BaseController
|
||||
cache_if_unauthenticated!
|
||||
@statuses = load_statuses
|
||||
account_ids = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
|
||||
accounts = Account.where(id: account_ids)
|
||||
|
||||
render json: @statuses, each_serializer: REST::StatusSerializer,
|
||||
relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id),
|
||||
account_relationships: AccountRelationshipsPresenter.new(account_ids, current_user&.account_id)
|
||||
account_relationships: AccountRelationshipsPresenter.new(accounts, current_user&.account_id)
|
||||
end
|
||||
|
||||
private
|
||||
|
@ -10,10 +10,11 @@ class Api::V1::Timelines::TagController < Api::V1::Timelines::BaseController
|
||||
cache_if_unauthenticated!
|
||||
@statuses = load_statuses
|
||||
account_ids = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
|
||||
accounts = Account.where(id: account_ids)
|
||||
|
||||
render json: @statuses, each_serializer: REST::StatusSerializer,
|
||||
relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id),
|
||||
account_relationships: AccountRelationshipsPresenter.new(account_ids, current_user&.account_id)
|
||||
account_relationships: AccountRelationshipsPresenter.new(accounts, current_user&.account_id)
|
||||
end
|
||||
|
||||
private
|
||||
|
Loading…
Reference in New Issue
Block a user