1 files changed, 17 insertions, 5 deletions
diff --git a/app/workers/after_remote_follow_worker.rb b/app/workers/after_remote_follow_worker.rb
index d12fa3454..edab83f85 100644
--- a/app/workers/after_remote_follow_worker.rb
+++ b/app/workers/after_remote_follow_worker.rb
@@ -5,15 +5,27 @@ class AfterRemoteFollowWorker
 
   sidekiq_options queue: 'pull', retry: 5
 
+  attr_reader :follow
+
   def perform(follow_id)
-    follow          = Follow.find(follow_id)
-    updated_account = FetchRemoteAccountService.new.call(follow.target_account.remote_url)
+    @follow = Follow.find(follow_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.destroy
     FollowService.new.call(follow.account, updated_account.acct)
-  rescue ActiveRecord::RecordNotFound
-    true
+  end
+
+  def updated_account
+    @_updated_account ||= FetchRemoteAccountService.new.call(follow.target_account.remote_url)
+  end
+
+  def processing_required?
+    !updated_account.nil? && updated_account.locked?
   end
 end