]> cat aescling's git repositories - mastodon.git/commitdiff
Fix method return when rescuing
authorEugen Rochko <eugen@zeonfederated.com>
Thu, 20 Oct 2016 16:36:12 +0000 (18:36 +0200)
committerEugen Rochko <eugen@zeonfederated.com>
Thu, 20 Oct 2016 16:36:12 +0000 (18:36 +0200)
app/services/fetch_remote_account_service.rb
app/services/fetch_remote_status_service.rb

index 8a6b1e1b48c8b138ef110c1e15ab18d54dabd81e..7977f5cba9622344a56478ee1283d7ea18229249 100644 (file)
@@ -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
index ae0d7e8a5721d75f371728241973004ccba8b15a..fbf7e3bd65fa5592648bdaf544af85f87fe72c1e 100644 (file)
@@ -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