Fix up a few exceptions
This commit is contained in:
parent
6f26b06454
commit
34bfc0f0dc
2 changed files with 11 additions and 4 deletions
|
@ -19,6 +19,8 @@ class FetchRemoteAccountService < BaseService
|
|||
Rails.logger.debug "Going to webfinger #{username}@#{domain}"
|
||||
|
||||
return FollowRemoteAccountService.new.call("#{username}@#{domain}")
|
||||
rescue TypeError => e
|
||||
Rails.logger.debug "Unparseable URL given: #{url}"
|
||||
rescue Nokogiri::XML::XPath::SyntaxError
|
||||
Rails.logger.debug "Invalid XML or missing namespace"
|
||||
end
|
||||
|
|
|
@ -100,9 +100,14 @@ class ProcessFeedService < BaseService
|
|||
|
||||
next unless media.nil?
|
||||
|
||||
media = MediaAttachment.new(account: status.account, status: status, remote_url: enclosure_link.attribute('href').value)
|
||||
media.file_remote_url = enclosure_link.attribute('href').value
|
||||
media.save
|
||||
begin
|
||||
media = MediaAttachment.new(account: status.account, status: status, remote_url: enclosure_link.attribute('href').value)
|
||||
media.file_remote_url = enclosure_link.attribute('href').value
|
||||
media.save
|
||||
rescue Paperclip::Errors::NotIdentifiedByImageMagickError
|
||||
Rails.logger.debug "Error saving attachment from #{enclosure_link.attribute('href').value}"
|
||||
next
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -213,7 +218,7 @@ class ProcessFeedService < BaseService
|
|||
end
|
||||
|
||||
def target_url(xml)
|
||||
xml.at_xpath('.//activity:object').at_xpath('./xmlns:link[@rel="alternate"]', activity: ACTIVITY_NS).attribute('href').value
|
||||
xml.at_xpath('.//activity:object', activity: ACTIVITY_NS).at_xpath('./xmlns:link[@rel="alternate"]').attribute('href').value
|
||||
end
|
||||
|
||||
def object_type(xml)
|
||||
|
|
Loading…
Reference in a new issue