mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-25 12:34:58 +01:00
Code Issues Projects Releases Wiki Activity

Move status serializer error handling to private method (#29031)

Browse Source
This commit is contained in:
Matt Jankowski 2024-02-06 09:54:26 -05:00 committed by GitHub
parent 0df86d77fd
commit 2f19ddd1fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/controllers/api/v1/statuses_controller.rb
View File

@ -73,11 +73,7 @@ class Api::V1::StatusesController < Api::BaseController
render json: @status, serializer: serializer_for_status render json: @status, serializer: serializer_for_status
rescue PostStatusService::UnexpectedMentionsError => e rescue PostStatusService::UnexpectedMentionsError => e
unexpected_accounts = ActiveModel::Serializer::CollectionSerializer.new( render json: unexpected_accounts_error_json(e), status: 422
e.accounts,
serializer: REST::AccountSerializer
)
render json: { error: e.message, unexpected_accounts: unexpected_accounts }, status: 422
end end
def update def update
@ -159,6 +155,17 @@ class Api::V1::StatusesController < Api::BaseController
@status.is_a?(ScheduledStatus) ? REST::ScheduledStatusSerializer : REST::StatusSerializer @status.is_a?(ScheduledStatus) ? REST::ScheduledStatusSerializer : REST::StatusSerializer
end end
def unexpected_accounts_error_json(error)
{
error: error.message,
unexpected_accounts: serialized_accounts(error.accounts),
}
end
def serialized_accounts(accounts)
ActiveModel::Serializer::CollectionSerializer.new(accounts, serializer: REST::AccountSerializer)
end
def pagination_params(core_params) def pagination_params(core_params)
params.slice(:limit).permit(:limit).merge(core_params) params.slice(:limit).permit(:limit).merge(core_params)
end end