treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Move status serializer chooser to private method (#29030)

main-rebase-security-fix
Matt Jankowski 2024-02-06 08:33:42 -05:00 committed by GitHub
parent cf42eba0f9
commit 93a5b3f9df
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,7 +71,7 @@ class Api::V1::StatusesController < Api::BaseController
with_rate_limit: true with_rate_limit: true
) )
render json: @status, serializer: @status.is_a?(ScheduledStatus) ? REST::ScheduledStatusSerializer : REST::StatusSerializer render json: @status, serializer: serializer_for_status
rescue PostStatusService::UnexpectedMentionsError => e rescue PostStatusService::UnexpectedMentionsError => e
unexpected_accounts = ActiveModel::Serializer::CollectionSerializer.new( unexpected_accounts = ActiveModel::Serializer::CollectionSerializer.new(
e.accounts, e.accounts,
@ -155,6 +155,10 @@ class Api::V1::StatusesController < Api::BaseController
) )
end end
def serializer_for_status
@status.is_a?(ScheduledStatus) ? REST::ScheduledStatusSerializer : REST::StatusSerializer
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