tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve spec coverage and clean up api/v1/media controller (#3467)

Browse Source
This commit is contained in:
Matt Jankowski
2017-05-30 21:11:29 -04:00
committed by GitHub
parent 83435c49ea
commit 8235623362
2 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,11 +10,11 @@ class Api::V1::MediaController < ApiController
respond_to :json
def create
@media = MediaAttachment.create!(account: current_user.account, file: media_params[:file])
@media = current_account.media_attachments.create!(file: media_params[:file])
rescue Paperclip::Errors::NotIdentifiedByImageMagickError
render json: { error: 'File type of uploaded media could not be verified' }, status: 422
render json: file_type_error, status: 422
rescue Paperclip::Error
render json: { error: 'Error processing thumbnail for uploaded media' }, status: 500
render json: processing_error, status: 500
end
private
@@ -22,4 +22,12 @@ class Api::V1::MediaController < ApiController
def media_params
params.permit(:file)
end
def file_type_error
{ error: 'File type of uploaded media could not be verified' }
end
def processing_error
{ error: 'Error processing thumbnail for uploaded media' }
end
end