From 07fd2cff930d26e33e8e3ac3fb3307554a3166b0 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Fri, 22 Mar 2024 17:31:53 -0300
Subject: [PATCH 1/2] fix: usar locks en moderaciones de instancia

closes #15788
---
 app/jobs/activity_pub/instance_moderation_job.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/jobs/activity_pub/instance_moderation_job.rb b/app/jobs/activity_pub/instance_moderation_job.rb
index 00100abf..9da0627f 100644
--- a/app/jobs/activity_pub/instance_moderation_job.rb
+++ b/app/jobs/activity_pub/instance_moderation_job.rb
@@ -9,7 +9,7 @@ class ActivityPub
     def perform(site:, hostnames:, perform_remotely: true)
       # Crear las instancias que no existan todavía
       hostnames.each do |hostname|
-        ActivityPub::Instance.find_or_create_by(hostname: hostname)
+        ActivityPub::Instance.lock.find_or_create_by(hostname: hostname)
       end
 
       instances = ActivityPub::Instance.where(hostname: hostnames)
@@ -20,7 +20,7 @@ class ActivityPub
         instances.find_each do |instance|
           # Esto bloquea cada una individualmente en la Social Inbox,
           # idealmente son pocas instancias las que aparecen.
-          site.instance_moderations.find_or_create_by(instance: instance)
+          site.instance_moderations.lock.find_or_create_by(instance: instance)
         end
 
         scope = site.instance_moderations.where(instance_id: instances.ids)

From 366494b61535358b6fecaa13482ff3dde10358af Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Fri, 22 Mar 2024 18:28:34 -0300
Subject: [PATCH 2/2] fix: typo

closes #15792

closes #15793

closes #15794

closes #15795

closes #15796

closes #15797

closes #15798

closes #15799

closes #15800

closes #15801

closes #15802

closes #15803

closes #15804

closes #15805

closes #15806

closes #15807

closes #15808

closes #15809

closes #15810

closes #15811

closes #15812

closes #15813

closes #15814

closes #15815

closes #15816

closes #15817

closes #15818
---
 app/jobs/activity_pub/process_job.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/jobs/activity_pub/process_job.rb b/app/jobs/activity_pub/process_job.rb
index a79abf5d..af686dbd 100644
--- a/app/jobs/activity_pub/process_job.rb
+++ b/app/jobs/activity_pub/process_job.rb
@@ -94,7 +94,7 @@ class ActivityPub
         .type_from(original_activity)
         .lock
         .find_or_initialize_by(uri: original_activity[:id], activity_pub: activity_pub, actor: actor).tap do |a|
-          a.lock! if o.persisted?
+          a.lock! if a.persisted?
           a.content = original_activity.dup
           a.content[:object] = object.uri
           a.save!
@@ -107,7 +107,7 @@ class ActivityPub
     # @return [Actor]
     def actor
       @actor ||= ::ActivityPub::Actor.lock.find_or_initialize_by(uri: original_activity[:actor]).tap do |a|
-        a.lock! if o.persisted?
+        a.lock! if a.persisted?
 
         unless a.instance
           a.instance = ::ActivityPub::Instance.lock.find_or_create_by(hostname: URI.parse(a.uri).hostname)