Bump version to 5.2 LTS (#39)

* Bump version to 5.2 LTS * Revert "Fix ProcessReferencesWorker error for tasks before update" This reverts commit 75c0e51. * Fix test * Add sidekiq option to process references worker
kmycode · Sep 27, 2023 · bb47ab1 · bb47ab1
1 parent 75c0e51
commit bb47ab1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/app/services/process_references_service.rb b/app/services/process_references_service.rb
@@ -46,7 +46,7 @@ def self.perform_worker_async(status, reference_parameters, urls)
     return unless need_process?(status, reference_parameters, urls)
 
     Rails.cache.write("status_reference:#{status.id}", true, expires_in: 10.minutes)
-    ProcessReferencesWorker.perform_async(status.id, reference_parameters, urls, no_fetch_urls: [])
+    ProcessReferencesWorker.perform_async(status.id, reference_parameters, urls, [])
   end
 
   def self.call_service(status, reference_parameters, urls)
@@ -133,6 +133,6 @@ def remove_old_references
   end
 
   def launch_worker
-    ProcessReferencesWorker.perform_async(@status.id, @reference_parameters, @urls, no_fetch_urls: @no_fetch_urls)
+    ProcessReferencesWorker.perform_async(@status.id, @reference_parameters, @urls, @no_fetch_urls)
   end
 end
diff --git a/app/workers/process_references_worker.rb b/app/workers/process_references_worker.rb
@@ -3,8 +3,10 @@
 class ProcessReferencesWorker
   include Sidekiq::Worker
 
-  def perform(status_id, ids, urls, no_fetch_urls: nil)
-    ProcessReferencesService.new.call(Status.find(status_id), ids || [], urls: urls || [], no_fetch_urls: no_fetch_urls || [])
+  sidekiq_options queue: 'pull', retry: 3
+
+  def perform(status_id, ids, urls, no_fetch_urls = nil)
+    ProcessReferencesService.new.call(Status.find(status_id), ids || [], urls: urls || [], no_fetch_urls: no_fetch_urls)
   rescue ActiveRecord::RecordNotFound
     true
   end

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
@@ -9,7 +9,7 @@ def kmyblue_major
     end
 
     def kmyblue_minor
-      1
+      2
     end
 
     def kmyblue_flag
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ def kmyblue_major @@
         end
         def kmyblue_minor
         end
         def kmyblue_flag
@@ Expand Down @@