From 183a23943bba2c214c56bf43c706f3f34d9bde32 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 17 Sep 2016 17:07:45 +0200
Subject: [PATCH] Fix how other services used old FollowRemoteAccountService

---
 app/services/process_feed_service.rb        | 3 ++-
 app/services/process_interaction_service.rb | 3 ++-
 app/services/process_mentions_service.rb    | 5 ++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index ba7558e1f2..e0b8574823 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -127,10 +127,11 @@ class ProcessFeedService < BaseService
 
     if account.nil?
       account = follow_remote_account_service.("#{username}@#{domain}", false)
-      return nil if account.nil?
     end
 
     Status.new(account: account, uri: target_id(xml), text: target_content(xml), url: target_url(xml))
+  rescue Goldfinger::Error, HTTP::Error
+    nil
   end
 
   def published(xml)
diff --git a/app/services/process_interaction_service.rb b/app/services/process_interaction_service.rb
index d9fcf9032d..3266f73e3b 100644
--- a/app/services/process_interaction_service.rb
+++ b/app/services/process_interaction_service.rb
@@ -15,7 +15,6 @@ class ProcessInteractionService < BaseService
 
     if account.nil?
       account = follow_remote_account_service.("#{username}@#{domain}", false)
-      return if account.nil?
     end
 
     if salmon.verify(envelope, account.keypair)
@@ -36,6 +35,8 @@ class ProcessInteractionService < BaseService
         delete_post!(xml, account)
       end
     end
+  rescue Goldfinger::Error, HTTP::Error
+    nil
   end
 
   private
diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index fb605326d5..04171cecb1 100644
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@ -11,7 +11,10 @@ class ProcessMentionsService < BaseService
       mentioned_account = Account.find_remote(username, domain)
 
       if mentioned_account.nil? && !domain.nil?
-        mentioned_account = follow_remote_account_service.("#{match.first}")
+        begin
+          mentioned_account = follow_remote_account_service.("#{match.first}")
+        rescue Goldfinger::Error, HTTP::Error
+        end
       end
 
       next if mentioned_account.nil?