From f90133d2adecedeb9b9fbc1ca524cdf097272893 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 11 Dec 2016 22:23:11 +0100
Subject: [PATCH] Thread resolving no longer needs to be separate from
 ProcessFeedService, since that is only ever called in the background

---
 app/services/process_feed_service.rb | 14 +++++++++++++-
 app/workers/removal_worker.rb        |  2 +-
 app/workers/thread_resolve_worker.rb | 15 ---------------
 3 files changed, 14 insertions(+), 17 deletions(-)
 delete mode 100644 app/workers/thread_resolve_worker.rb

diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index 1a831fa735f..a525bc32167 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -121,7 +121,8 @@ class ProcessFeedService < BaseService
 
     def find_or_resolve_status(parent, uri, url)
       status = find_status(uri)
-      ThreadResolveWorker.perform_async(parent.id, url) if status.nil?
+
+      ResolveThread.new.call(parent, url) if status.nil?
 
       status
     end
@@ -242,4 +243,15 @@ class ProcessFeedService < BaseService
       "#{username}@#{domain}"
     end
   end
+
+  class ResolveThread
+    def call(child_status, parent_url)
+      parent_status = FetchRemoteStatusService.new.call(parent_url)
+
+      return if parent_status.nil?
+
+      child_status.thread = parent_status
+      child_status.save!
+    end
+  end
 end
diff --git a/app/workers/removal_worker.rb b/app/workers/removal_worker.rb
index 7470c54f561..eae27c66fa0 100644
--- a/app/workers/removal_worker.rb
+++ b/app/workers/removal_worker.rb
@@ -6,4 +6,4 @@ class RemovalWorker
   def perform(status_id)
     RemoveStatusService.new.call(Status.find(status_id))
   end
-end
\ No newline at end of file
+end
diff --git a/app/workers/thread_resolve_worker.rb b/app/workers/thread_resolve_worker.rb
deleted file mode 100644
index 84eae73befa..00000000000
--- a/app/workers/thread_resolve_worker.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-class ThreadResolveWorker
-  include Sidekiq::Worker
-
-  def perform(child_status_id, parent_url)
-    child_status  = Status.find(child_status_id)
-    parent_status = FetchRemoteStatusService.new.call(parent_url)
-
-    return if parent_status.nil?
-
-    child_status.thread = parent_status
-    child_status.save!
-  end
-end