From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 20 Oct 2016 16:36:12 +0000 (+0200)
Subject: Fix method return when rescuing
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=852c82435d8e86fdd98ceb749eeb8578020fae18;p=mastodon.git

Fix method return when rescuing
---

diff --git a/app/services/fetch_remote_account_service.rb b/app/services/fetch_remote_account_service.rb
index 8a6b1e1b4..7977f5cba 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 ae0d7e8a5..fbf7e3bd6 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