From 5f5b929aa89098726ddb55098756d01e060fd9dc Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 6 Mar 2024 15:59:48 -0300
Subject: [PATCH 1/2] fix: traducciones

---
 config/locales/en.yml | 17 ++++++++---------
 config/locales/es.yml | 17 ++++++++---------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0ca90aa7..0f010c89 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -50,6 +50,14 @@ en:
     pm: pm
     format: '%-I:%M %p'
   components:
+    actor:
+      user: Username
+      profile: Profile
+      profile_name: Profile name
+      preferred_name: Name in Fediverse
+      profile_id: ID
+      profile_published: Published
+      profile_summary: Summary
     block_list:
       know_more: Know more
       instances_blocked: Instances blocked
@@ -107,15 +115,6 @@ en:
       text_allow: Always approve
       text_block: Block
       text_report: Report
-  actor_moderations:
-    show:
-      user: Username
-      profile: Profile
-      profile_name: Profile name
-      preferred_name: Name in Fediverse
-      profile_id: ID
-      profile_published: Published
-      profile_summary: Summary
   remote_flags:
     report_message: "Hi! Someone using Sutty CMS reported this account on your instance. We don't have support for customized report messages yet, but we will soon. You can reach us at %{panel_actor_mention}."
   moderation_queue:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 40a1a18c..0a2538a7 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -50,6 +50,14 @@ es:
     pm: pm
     format: '%-H:%M'
   components:
+    actor:
+      user: Nombre de usuarie
+      profile: Cuenta de Origen
+      profile_name: Nombre de la cuenta
+      preferred_name: Nombre en el Fediverso
+      profile_id: ID
+      profile_published: Publicada
+      profile_summary: Presentación
     block_list:
       know_more: Saber más (en inglés)
       instances_blocked: Instancias bloqueadas
@@ -106,15 +114,6 @@ es:
       text_allow: Aprobar siempre
       text_block: Bloquear
       text_report: Reportar
-  actor_moderations:
-    show:
-      user: Nombre de usuarie
-      profile: Cuenta de Origen
-      profile_name: Nombre de la cuenta
-      preferred_name: Nombre en el Fediverso
-      profile_id: ID
-      profile_published: Publicada
-      profile_summary: Presentación
   remote_flags:
     report_message: "¡Hola! Une usuarie de Sutty CMS reportó esta cuenta en tu instancia. Todavía no tenemos soporte para mensajes personalizados. Podés contactarnos en %{panel_actor_mention}."
   moderation_queue:

From 2e04bc8eac09bcfc4929ca9670971fcf5da35056 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 6 Mar 2024 17:15:21 -0300
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20las=20actividades=20est=C3=A1n=20dup?=
 =?UTF-8?q?licadas=20con=20respecto=20a=20su=20estado?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

por ejemplo, el borrado de une actore puede estar dirigido a todos los
sitios, con lo que se crea varias veces (aunque se ejecuta solo una)
---
 app/models/activity_pub/activity.rb                 | 2 ++
 app/models/activity_pub/actor.rb                    | 3 +++
 app/models/activity_pub/concerns/json_ld_concern.rb | 2 --
 app/models/activity_pub/object.rb                   | 3 +++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/models/activity_pub/activity.rb b/app/models/activity_pub/activity.rb
index 1147c5b8..ee555474 100644
--- a/app/models/activity_pub/activity.rb
+++ b/app/models/activity_pub/activity.rb
@@ -20,6 +20,8 @@ class ActivityPub
     has_one :object, through: :activity_pub
 
     validates :activity_pub_id, presence: true
+    # Las actividades son únicas con respecto a su estado
+    validates :uri, presence: true, uniqueness: { scope: :activity_pub_id, message: 'estado duplicado' }
 
     # Siempre en orden descendiente para saber el último estado
     default_scope -> { order(created_at: :desc) }
diff --git a/app/models/activity_pub/actor.rb b/app/models/activity_pub/actor.rb
index 0a39dcde..919bc5e0 100644
--- a/app/models/activity_pub/actor.rb
+++ b/app/models/activity_pub/actor.rb
@@ -15,6 +15,9 @@ class ActivityPub
     has_many :activities
     has_many :remote_flags
 
+    # Les actores son únicxs a toda la base de datos
+    validates :uri, presence: true, uniqueness: true
+
     # Obtiene el nombre de la Actor como mención, solo si obtuvimos el
     # contenido de antemano.
     #
diff --git a/app/models/activity_pub/concerns/json_ld_concern.rb b/app/models/activity_pub/concerns/json_ld_concern.rb
index bc30330c..282027df 100644
--- a/app/models/activity_pub/concerns/json_ld_concern.rb
+++ b/app/models/activity_pub/concerns/json_ld_concern.rb
@@ -6,8 +6,6 @@ class ActivityPub
       extend ActiveSupport::Concern
 
       included do
-        validates :uri, presence: true, uniqueness: true
-
         # Cuando asignamos contenido, obtener la URI si no lo hicimos ya
         before_save :uri_from_content!, unless: :uri?
 
diff --git a/app/models/activity_pub/object.rb b/app/models/activity_pub/object.rb
index c196160f..15b07bee 100644
--- a/app/models/activity_pub/object.rb
+++ b/app/models/activity_pub/object.rb
@@ -5,6 +5,9 @@ class ActivityPub
   class Object < ApplicationRecord
     include ActivityPub::Concerns::JsonLdConcern
 
+    # Los objetos son únicos a toda la base de datos
+    validates :uri, presence: true, uniqueness: true
+
     has_many :activity_pubs, as: :object
 
     # Encontrar le Actor por su relación con el objeto