From 852c82435d8e86fdd98ceb749eeb8578020fae18 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 20 Oct 2016 18:36:12 +0200 Subject: [PATCH] Fix method return when rescuing --- app/services/fetch_remote_account_service.rb | 2 ++ app/services/fetch_remote_status_service.rb | 1 + 2 files changed, 3 insertions(+) diff --git a/app/services/fetch_remote_account_service.rb b/app/services/fetch_remote_account_service.rb index 8a6b1e1b48..7977f5cba9 100644 --- a/app/services/fetch_remote_account_service.rb +++ b/app/services/fetch_remote_account_service.rb @@ -21,7 +21,9 @@ class FetchRemoteAccountService < BaseService return FollowRemoteAccountService.new.call("#{username}@#{domain}") rescue TypeError => e Rails.logger.debug "Unparseable URL given: #{url}" + nil rescue Nokogiri::XML::XPath::SyntaxError Rails.logger.debug "Invalid XML or missing namespace" + nil end end diff --git a/app/services/fetch_remote_status_service.rb b/app/services/fetch_remote_status_service.rb index ae0d7e8a57..fbf7e3bd65 100644 --- a/app/services/fetch_remote_status_service.rb +++ b/app/services/fetch_remote_status_service.rb @@ -33,5 +33,6 @@ class FetchRemoteStatusService < BaseService return FollowRemoteAccountService.new.call("#{username}@#{domain}") rescue Nokogiri::XML::XPath::SyntaxError Rails.logger.debug "Invalid XML or missing namespace" + nil end end