2 files changed, 23 insertions, 10 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 88f6f4a46..87865bfdc 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -34,12 +34,7 @@ class FeedManager
       trim(timeline_type, account.id)
     end
 
-    broadcast(account.id, event: 'update', payload: inline_render(account, 'api/v1/statuses/show', status))
-  end
-
-  def broadcast(timeline_id, options = {})
-    options[:queued_at] = (Time.now.to_f * 1000.0).to_i
-    redis.publish("timeline:#{timeline_id}", Oj.dump(options))
+    PushUpdateWorker.perform_async(timeline_type, account.id, status.id)
   end
 
   def trim(type, account_id)
@@ -81,10 +76,6 @@ class FeedManager
     end
   end
 
-  def inline_render(target_account, template, object)
-    Rabl::Renderer.new(template, object, view_path: 'app/views', format: :json, scope: InlineRablScope.new(target_account)).render
-  end
-
   private
 
   def redis
diff --git a/app/workers/push_update_worker.rb b/app/workers/push_update_worker.rb
new file mode 100644
index 000000000..166a9b449
--- /dev/null
+++ b/app/workers/push_update_worker.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class PushUpdateWorker
+  include Sidekiq::Worker
+
+  def perform(timeline, account_id, status_id)
+    account = Account.find(account_id)
+    status  = Status.find(status_id)
+    
+    message = Rabl::Renderer.new(
+      'api/v1/statuses/show', 
+      status, 
+      view_path: 'app/views', 
+      format: :json, 
+      scope: InlineRablScope.new(account)
+    )
+
+    Redis.current.publish("timeline:#{account.id}", Oj.dump({ event: :update, payload: message, queued_at: (Time.now.to_f * 1000.0).to_i }))
+  rescue ActiveRecord::RecordNotFound
+    true
+  end
+end