zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 9 Releases Wiki Activity

Fix method return when rescuing

This commit is contained in:
Eugen Rochko 2016-10-20 18:36:12 +02:00
parent 04bbc57690
commit 852c82435d
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/fetch_remote_account_service.rb
View File

@ -21,7 +21,9 @@ class FetchRemoteAccountService < BaseService
return FollowRemoteAccountService.new.call("#{username}@#{domain}") return FollowRemoteAccountService.new.call("#{username}@#{domain}")
rescue TypeError => e rescue TypeError => e
Rails.logger.debug "Unparseable URL given: #{url}" Rails.logger.debug "Unparseable URL given: #{url}"
nil
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"
nil
end end
end end

1
app/services/fetch_remote_status_service.rb
View File

@ -33,5 +33,6 @@ class FetchRemoteStatusService < BaseService
return FollowRemoteAccountService.new.call("#{username}@#{domain}") return FollowRemoteAccountService.new.call("#{username}@#{domain}")
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"
nil
end end
end end