logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 852c82435d8e86fdd98ceb749eeb8578020fae18
parent: 04bbc576906ff70feed7d42fef0e6db17fdd9ed3
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Thu, 20 Oct 2016 18:36:12 +0200

Fix method return when rescuing

Diffstat:

Mapp/services/fetch_remote_account_service.rb2++
Mapp/services/fetch_remote_status_service.rb1+
2 files changed, 3 insertions(+), 0 deletions(-)

diff --git 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 @@ -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