gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-26 23:41:52 +00:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Catch Paperclip errors on /api/v1/media, return early from update profile service if XML given is nil

Browse Source
This commit is contained in:
Eugen Rochko 2016-10-06 14:39:34 +02:00
parent cdad5d322d
commit 2f5b205916
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,5 +4,9 @@ class Api::V1::MediaController < ApiController
def create def create
@media = MediaAttachment.create!(account: current_user.account, file: params[:file]) @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
end end

2
app/services/update_remote_profile_service.rb
View File

@ -1,5 +1,7 @@
class UpdateRemoteProfileService < BaseService class UpdateRemoteProfileService < BaseService
def call(author_xml, account) def call(author_xml, account)
return if author_xml.nil?
if author_xml.at_xpath('./poco:displayName').nil? if author_xml.at_xpath('./poco:displayName').nil?
account.display_name = account.username account.display_name = account.username
else else