From ceeb0009ef2fcd1faa01d5e59f2f77c2a0f124cb Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Mon, 18 Mar 2024 14:40:11 -0300
Subject: [PATCH] fix: descubrir el tipo de objeto siempre

closes #15656

closes #15657

closes #15658

closes #15660

closes #15661

closes #15662

closes #15663

closes #15664

closes #15665

closes #15666

closes #15667

closes #15668

closes #15669

closes #15670

closes #15671

closes #15672

closes #15673

closes #15674

closes #15675

closes #15676

closes #15677

closes #15678

closes #15679

closes #15680

closes #15681

closes #15682

closes #15683

closes #15684

closes #15685

closes #15686

closes #15687

closes #15688

closes #15689

closes #15690

closes #15691

closes #15692

closes #15693

closes #15694

closes #15695

closes #15696

closes #15697

closes #15698

closes #15699

closes #15700

closes #15701

closes #15702

closes #15704

closes #15705

closes #15706

closes #15707

closes #15708
---
 app/jobs/activity_pub/process_job.rb | 13 +------------
 app/models/activity_pub/object.rb    | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/jobs/activity_pub/process_job.rb b/app/jobs/activity_pub/process_job.rb
index 6554b44d..9b72be43 100644
--- a/app/jobs/activity_pub/process_job.rb
+++ b/app/jobs/activity_pub/process_job.rb
@@ -64,18 +64,7 @@ class ActivityPub
     # @return [ActivityPub::Object]
     def object
       @object ||= ::ActivityPub::Object.find_or_initialize_by(uri: object_uri).tap do |o|
-        # XXX: Si el objeto es una actividad, esto siempre va a ser
-        # Generic
-        o.type ||= 'ActivityPub::Object::Generic'
-
-        if object_embedded?
-          o.content = original_object
-          begin
-            type = original_object[:type].presence
-            o.type = "ActivityPub::Object::#{type}".constantize if type
-          rescue NameError
-          end
-        end
+        o.content = original_object if object_embedded?
 
         o.save!
 
diff --git a/app/models/activity_pub/object.rb b/app/models/activity_pub/object.rb
index 1d5d4478..16cd6b01 100644
--- a/app/models/activity_pub/object.rb
+++ b/app/models/activity_pub/object.rb
@@ -5,6 +5,8 @@ class ActivityPub
   class Object < ApplicationRecord
     include ActivityPub::Concerns::JsonLdConcern
 
+    before_validation :type_from_content!, unless: :type?
+
     # Los objetos son únicos a toda la base de datos
     validates :uri, presence: true, url: true, uniqueness: true
 
@@ -38,5 +40,20 @@ class ActivityPub
 
       @referenced ||= DistributedPress::V1::Social::ReferencedObject.new(object: content, dereferencer: site.social_inbox.dereferencer)
     end
+
+    private
+
+    # Encuentra el tipo a partir del contenido, si existe.
+    #
+    # XXX: Si el objeto es una actividad, esto siempre va a ser
+    # Generic
+    def type_from_content!
+      self.type =
+        begin
+          "ActivityPub::Object::#{content['type'].presence || 'Generic'}".constantize
+        rescue NameError
+          ActivityPub::Object::Generic
+        end
+    end
   end
 end