forked from treehouse/mastodon
Fix up a few exceptions
parent
f7f3e6e3be
commit
c257b29d86
|
@ -19,6 +19,8 @@ class FetchRemoteAccountService < BaseService
|
||||||
Rails.logger.debug "Going to webfinger #{username}@#{domain}"
|
Rails.logger.debug "Going to webfinger #{username}@#{domain}"
|
||||||
|
|
||||||
return FollowRemoteAccountService.new.call("#{username}@#{domain}")
|
return FollowRemoteAccountService.new.call("#{username}@#{domain}")
|
||||||
|
rescue TypeError => e
|
||||||
|
Rails.logger.debug "Unparseable URL given: #{url}"
|
||||||
rescue Nokogiri::XML::XPath::SyntaxError
|
rescue Nokogiri::XML::XPath::SyntaxError
|
||||||
Rails.logger.debug "Invalid XML or missing namespace"
|
Rails.logger.debug "Invalid XML or missing namespace"
|
||||||
end
|
end
|
||||||
|
|
|
@ -100,9 +100,14 @@ class ProcessFeedService < BaseService
|
||||||
|
|
||||||
next unless media.nil?
|
next unless media.nil?
|
||||||
|
|
||||||
|
begin
|
||||||
media = MediaAttachment.new(account: status.account, status: status, remote_url: enclosure_link.attribute('href').value)
|
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.file_remote_url = enclosure_link.attribute('href').value
|
||||||
media.save
|
media.save
|
||||||
|
rescue Paperclip::Errors::NotIdentifiedByImageMagickError
|
||||||
|
Rails.logger.debug "Error saving attachment from #{enclosure_link.attribute('href').value}"
|
||||||
|
next
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -213,7 +218,7 @@ class ProcessFeedService < BaseService
|
||||||
end
|
end
|
||||||
|
|
||||||
def target_url(xml)
|
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
|
end
|
||||||
|
|
||||||
def object_type(xml)
|
def object_type(xml)
|
||||||
|
|
Loading…
Reference in New Issue