From ca4017dbd0ff732b3ca6374103f04a5c178f506c Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 28 Mar 2024 10:09:20 -0300
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20activejob=20usa=20su=20propio=20m?=
 =?UTF-8?q?=C3=A9todo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes #15621

closes #15622

closes #15623

closes #15729

closes #15730

closes #15731

closes #15735

closes #15736

closes #15824

closes #15838

closes #15839

closes #15882
---
 app/jobs/activity_pub/process_job.rb | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/app/jobs/activity_pub/process_job.rb b/app/jobs/activity_pub/process_job.rb
index 4d9c6869..dd76a928 100644
--- a/app/jobs/activity_pub/process_job.rb
+++ b/app/jobs/activity_pub/process_job.rb
@@ -3,7 +3,9 @@
 class ActivityPub
   # Procesar las actividades a medida que llegan
   class ProcessJob < ApplicationJob
-    attr_reader :body, :initial_state
+    attr_reader :body
+
+    retry_on ActivityPub::RecordInvalid
 
     # Procesa la actividad en segundo plano
     #
@@ -12,7 +14,6 @@ class ActivityPub
     def perform(site:, body:, initial_state: :paused)
       @site = site
       @body = body
-      @initial_state = initial_state
 
       ActiveRecord::Base.connection_pool.with_connection do
         ::ActivityPub.transaction do
@@ -28,29 +29,6 @@ class ActivityPub
       end
     end
 
-    # Al generar una excepción, en lugar de seguir intentando, enviamos
-    # el reporte.
-    #
-    # @param error [Exception]
-    # @return [Bool]
-    def handle_error(error)
-      case error
-      when ActiveRecord::RecordInvalid then retry_in(ApplicationJob.random_wait)
-      else
-        ExceptionNotifier.notify_exception(
-          error,
-          data: {
-            site: site.name,
-            body: body,
-            initial_state: initial_state,
-            activity: original_activity,
-            message: 'Esta acción se canceló automáticamente, para regenerarla, volver a correr el proceso con los mismos parámetros.'
-          })
-      end
-
-      false
-    end
-
     private
 
     # Si el objeto ya viene incorporado en la actividad o lo tenemos

From 3f7f8878417bb034f97738de38d5e094bad0e65e Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 28 Mar 2024 10:13:13 -0300
Subject: [PATCH 2/2] fix: activejob gestiona errores por su cuenta

closes #15351

closes #15352

closes #15612

closes #15618

closes #15621

closes #15622

closes #15623

closes #15729

closes #15730

closes #15731

closes #15735

closes #15736

closes #15776

closes #15824

closes #15827

closes #15828

closes #15829

closes #15830

closes #15831

closes #15832

closes #15838

closes #15839

closes #15882
---
 app/jobs/activity_pub/fetch_job.rb | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/app/jobs/activity_pub/fetch_job.rb b/app/jobs/activity_pub/fetch_job.rb
index 54641dbf..0a3ebf03 100644
--- a/app/jobs/activity_pub/fetch_job.rb
+++ b/app/jobs/activity_pub/fetch_job.rb
@@ -19,25 +19,16 @@ class ActivityPub
     #
     # @param error [Exception]
     # @return [Bool]
-    def handle_error(error)
-      case error
-      when FastJsonparser::ParseError
-        expire
-
-        ExceptionNotifier.notify_exception(error, data: { site: site.name, object: object.uri, body: response.body })
-
-        false
-      when ActiveRecord::RecordInvalid, SocketError, SystemCallError, Net::OpenTimeout, OpenSSL::OpenSSLError
-        retry_in(ApplicationJob.random_wait)
-
-        false
-      else
-        expire
-
-        true
-      end
+    discard_on(FastJsonparser::ParseError) do |error|
+      ExceptionNotifier.notify_exception(error, data: { site: site.name, object: object.uri, body: response.body })
     end
 
+    retry_on ActiveRecord::RecordInvalid
+    retry_on SocketError, wait: ApplicationJob.random_wait
+    retry_on SystemCallError, wait: ApplicationJob.random_wait
+    retry_on Net::OpenTimeout, wait: ApplicationJob.random_wait
+    retry_on OpenSSL::OpenSSLError, wait: ApplicationJob.random_wait
+
     def perform(site:, object_id:)
       ActivityPub::Object.transaction do
         @site = site