mirror of https://github.com/Siphonay/mastodon
Catch Paperclip errors on /api/v1/media, return early from update profile service if XML given is nil
This commit is contained in:
parent
cdad5d322d
commit
2f5b205916
|
@ -4,5 +4,9 @@ class Api::V1::MediaController < ApiController
|
|||
|
||||
def create
|
||||
@media = MediaAttachment.create!(account: current_user.account, file: params[:file])
|
||||
rescue Paperclip::Errors::NotIdentifiedByImageMagickError
|
||||
render json: { error: 'File type of uploaded media could not be verified' }, status: 422
|
||||
rescue Paperclip::Error
|
||||
render json: { error: 'Error processing thumbnail for uploaded media' }, status: 500
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
class UpdateRemoteProfileService < BaseService
|
||||
def call(author_xml, account)
|
||||
return if author_xml.nil?
|
||||
|
||||
if author_xml.at_xpath('./poco:displayName').nil?
|
||||
account.display_name = account.username
|
||||
else
|
||||
|
|
Loading…
Reference in New Issue