gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Improved error handling for FollowRemoteService

Browse source
This commit is contained in:
Eugen Rochko 2016-09-17 17:03:36 +02:00
parent 8c0b19012b
commit 0e9c1a297a
3 changed files with 29 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/services/follow_remote_account_service.rb
View file

@ -31,9 +31,12 @@ class FollowRemoteAccountService < BaseService
feed = get_feed(account.remote_url)
hubs = feed.xpath('//xmlns:link[@rel="hub"]')
if hubs.empty? || hubs.first.attribute('href').nil? || feed.at_xpath('/xmlns:feed/xmlns:author/xmlns:uri').nil?
Rails.logger.debug "Cannot find PuSH hub or author for #{uri}"
return nil
if hubs.empty? || hubs.first.attribute('href').nil?
raise Goldfinger::Error, "No PubSubHubbub hubs found"
end
if feed.at_xpath('/xmlns:feed/xmlns:author/xmlns:uri').nil?
raise Goldfinger::Error, "No author URI found"
end
account.uri = feed.at_xpath('/xmlns:feed/xmlns:author/xmlns:uri').content
@ -53,9 +56,6 @@ class FollowRemoteAccountService < BaseService
end
return account
rescue Goldfinger::Error, HTTP::Error
Rails.logger.debug "Error while fetching data for #{uri}"
nil
end
private
@ -89,3 +89,9 @@ class FollowRemoteAccountService < BaseService
HTTP
end
end
class NoAuthorFeedError < StandardError
end
class NoHubError < StandardError
end