gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-09-05 17:31:12 +00:00
Code Issues Actions 34 Packages Projects Releases Wiki Activity

Avoid return render... in api/v1/media

Browse Source
This commit is contained in:
Matt Jankowski 2025-07-15 12:41:20 -04:00
parent 4fa203e69e
commit 04a8c3d0bd
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/controllers/api/v1/media_controller.rb
View File

@ -5,6 +5,10 @@ class Api::V1::MediaController < Api::BaseController
before_action :require_user! before_action :require_user!
before_action :set_media_attachment, except: [:create, :destroy] before_action :set_media_attachment, except: [:create, :destroy]
before_action :check_processing, except: [:create, :destroy] before_action :check_processing, except: [:create, :destroy]
with_options only: :destroy do
before_action :set_current_account_media_attachment
before_action :check_usage_by_status
end
def show def show
render json: @media_attachment, serializer: REST::MediaAttachmentSerializer, status: status_code_for_media_attachment render json: @media_attachment, serializer: REST::MediaAttachmentSerializer, status: status_code_for_media_attachment
@ -26,10 +30,6 @@ class Api::V1::MediaController < Api::BaseController
end end
def destroy def destroy
@media_attachment = current_account.media_attachments.find(params[:id])
return render json: in_usage_error, status: 422 unless @media_attachment.status_id.nil?
@media_attachment.destroy @media_attachment.destroy
render_empty render_empty
end end
@ -44,6 +44,14 @@ class Api::V1::MediaController < Api::BaseController
@media_attachment = current_account.media_attachments.where(status_id: nil).find(params[:id]) @media_attachment = current_account.media_attachments.where(status_id: nil).find(params[:id])
end end
def set_current_account_media_attachment
@media_attachment = current_account.media_attachments.find(params[:id])
end
def check_usage_by_status
render json: in_usage_error, status: 422 if @media_attachment.status_id?
end
def check_processing def check_processing
render json: processing_error, status: 422 if @media_attachment.processing_failed? render json: processing_error, status: 422 if @media_attachment.processing_failed?
end end