From 0578b03ee76f8094c1b7a9fa6ee4fbb491b2503c Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 20 Mar 2024 17:50:39 -0300
Subject: [PATCH] fix: reportar implicar bloquear #15600

---
 app/models/activity_pub.rb     | 5 +++--
 app/models/actor_moderation.rb | 2 +-
 config/locales/en.yml          | 4 ++--
 config/locales/es.yml          | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/models/activity_pub.rb b/app/models/activity_pub.rb
index 335121d2..cd893406 100644
--- a/app/models/activity_pub.rb
+++ b/app/models/activity_pub.rb
@@ -135,11 +135,12 @@ class ActivityPub < ApplicationRecord
       end
     end
 
-    # Solo podemos reportarla luego de rechazarla
+    # Reportarla implica rechazarla
     event :report do
-      transitions from: :rejected, to: :reported
+      transitions from: %i[paused approved rejected], to: :reported
 
       after do
+        ActivityPub::InboxJob.perform_later(site: site, activity: activities.first.uri, action: :reject)
         ActivityPub::RemoteFlagJob.perform_later(remote_flag: remote_flag) if remote_flag.waiting?
       end
     end
diff --git a/app/models/actor_moderation.rb b/app/models/actor_moderation.rb
index 18149be4..1c3cf83a 100644
--- a/app/models/actor_moderation.rb
+++ b/app/models/actor_moderation.rb
@@ -43,7 +43,7 @@ class ActorModeration < ApplicationRecord
     # Al reportar, necesitamos asociar una RemoteFlag para poder
     # enviarla.
     event :report do
-      transitions from: %i[blocked], to: :reported
+      transitions from: %i[pause allowed blocked], to: :reported, after: :synchronize!
 
       after do
         ActivityPub::RemoteFlagJob.perform_later(remote_flag: remote_flag) if remote_flag.waiting?
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 35b857e6..643effaf 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -106,7 +106,7 @@ en:
       text_reject: Reject
       text_reply: Reply
       text_report: Report
-      confirm_report: "Send report to the remote instance?"
+      confirm_report: "Send report to the remote instance? This action will also reject the comment."
     instances_btn_box:
       text_pause: Check case by case
       text_allow: Allow everything
@@ -116,7 +116,7 @@ en:
       text_allow: Always approve
       text_block: Block
       text_report: Report
-      confirm_report: "Send report to the remote instance?"
+      confirm_report: "Send report to the remote instance? This action will also block the account."
   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}."
   activity_pubs:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 77e611ed..b8bfc524 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -105,7 +105,7 @@ es:
       text_approve: Aceptar
       text_reject: Rechazar
       text_report: Reportar
-      confirm_report: "¿Enviar el reporte a la instancia remota?"
+      confirm_report: "¿Enviar el reporte a la instancia remota? Esta acción también rechazará el comentario."
     instances_btn_box:
       text_pause: Moderar caso por caso
       text_allow: Permitir todo
@@ -115,7 +115,7 @@ es:
       text_allow: Aprobar siempre
       text_block: Bloquear
       text_report: Reportar
-      confirm_report: "¿Enviar el reporte a la instancia remota?"
+      confirm_report: "¿Enviar el reporte a la instancia remota? Esta acción también bloqueará la cuenta."
   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}."
   activity_pubs: