1 files changed, 17 insertions, 5 deletions
diff --git a/app/workers/after_remote_follow_request_worker.rb b/app/workers/after_remote_follow_request_worker.rb
index 928069211..84eb6ade2 100644
--- a/app/workers/after_remote_follow_request_worker.rb
+++ b/app/workers/after_remote_follow_request_worker.rb
@@ -5,15 +5,27 @@ class AfterRemoteFollowRequestWorker
 
   sidekiq_options queue: 'pull', retry: 5
 
+  attr_reader :follow_request
+
   def perform(follow_request_id)
-    follow_request  = FollowRequest.find(follow_request_id)
-    updated_account = FetchRemoteAccountService.new.call(follow_request.target_account.remote_url)
+    @follow_request = FollowRequest.find(follow_request_id)
+    process_follow_service if processing_required?
+  rescue ActiveRecord::RecordNotFound
+    true
+  end
 
-    return if updated_account.nil? || updated_account.locked?
+  private
 
+  def process_follow_service
     follow_request.destroy
     FollowService.new.call(follow_request.account, updated_account.acct)
-  rescue ActiveRecord::RecordNotFound
-    true
+  end
+
+  def processing_required?
+    !updated_account.nil? && !updated_account.locked?
+  end
+
+  def updated_account
+    @_updated_account ||= FetchRemoteAccountService.new.call(follow_request.target_account.remote_url)
   end
 end