diff --git a/app/services/process_references_service.rb b/app/services/process_references_service.rb index 0be4bc9160..faf5965a7a 100644 --- a/app/services/process_references_service.rb +++ b/app/services/process_references_service.rb @@ -46,7 +46,7 @@ class ProcessReferencesService < BaseService 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 @@ class ProcessReferencesService < BaseService 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 index 8b6d0d7b34..f082744857 100644 --- 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 index 4e9032b40a..611f439135 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -9,7 +9,7 @@ module Mastodon end def kmyblue_minor - 1 + 2 end def kmyblue_flag