From 114fc3cdd01e7932776a5fd4601451c821aef11d Mon Sep 17 00:00:00 2001
From: multiple creatures <dev@multiple-creature.party>
Date: Thu, 12 Dec 2019 04:33:51 -0600
Subject: simplify the asynchronous post worker

---
 app/workers/post_status_worker.rb | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'app/workers/post_status_worker.rb')

diff --git a/app/workers/post_status_worker.rb b/app/workers/post_status_worker.rb
index 7b44c9a54..82f5e78e9 100644
--- a/app/workers/post_status_worker.rb
+++ b/app/workers/post_status_worker.rb
@@ -3,20 +3,14 @@
 class PostStatusWorker
   include Sidekiq::Worker
 
-  sidekiq_options unique: :until_executed
-
   def perform(status_id, options = {})
     status = Status.find(status_id)
     return false if status.destroyed?
 
-    status.visibility = options[:visibility] if options[:visibility]
-    status.local_only = options[:local_only] if options[:local_only]
-    status.reject_replies = options[:reject_replies] if options[:reject_replies]
-    status.save!
-
-    process_mentions_service.call(status) unless options[:nomentions].present?
+    status.update(options.slice(:visibility, :local_only, :reject_replies).compact)
+    process_mentions_service.call(status, skip_process: true) unless options[:nomentions]
 
-    LinkCrawlWorker.perform_async(status.id) unless options[:nocrawl] || status.spoiler_text?
+    LinkCrawlWorker.perform_async(status.id) unless options[:nocrawl] || status.spoiler_text.present?
     DistributionWorker.perform_async(status.id) unless options[:distribute] == false
 
     unless status.local_only? || options[:distribute] == false || options[:federate] == false
@@ -37,6 +31,8 @@ class PostStatusWorker
     true
   end
 
+  private
+
   def process_mentions_service
     ProcessMentionsService.new
   end
-- 
cgit