From fcbff3e1c13a5b8500fd898e9bd2753ca070c853 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Fri, 15 Mar 2024 16:52:42 -0300
Subject: [PATCH] fix: enviar el reporte firmado por el sitio #15605
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

pasaban dos cosas:

1. para firmar correctamente, el cliente necesita recibir el path
   completo por su parámetro `endpoint`

2. la petición tiene que ser hecha por le misme actore que hace el
   reporte, como estábamos firmando con el sitio, mastodon creía que era
   un relay y esperaba que se envíen firmas ld
---
 .env                                     |  2 ++
 app/jobs/activity_pub/remote_flag_job.rb |  9 +++++++--
 app/models/activity_pub/remote_flag.rb   | 16 ++++++++++++----
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/.env b/.env
index 480175f8..fe503b11 100644
--- a/.env
+++ b/.env
@@ -39,3 +39,5 @@ GITLAB_PROJECT=
 GITLAB_TOKEN=
 PGVER=15
 PGPID=/run/postgresql.pid
+PANEL_ACTOR_MENTION=@sutty@sutty.nl
+PANEL_ACTOR_SITE_ID=1
diff --git a/app/jobs/activity_pub/remote_flag_job.rb b/app/jobs/activity_pub/remote_flag_job.rb
index f5650d53..20833bd4 100644
--- a/app/jobs/activity_pub/remote_flag_job.rb
+++ b/app/jobs/activity_pub/remote_flag_job.rb
@@ -15,10 +15,15 @@ class ActivityPub
     def perform(remote_flag:)
       return if remote_flag.may_queue?
 
+      inbox = remote_flag.actor&.content&.[]('inbox')
+
+      raise 'Inbox is missing for actor' if inbox.blank?
+
       remote_flag.queue!
 
-      client = remote_flag.site.social_inbox.client_for(remote_flag.actor&.content['inbox'])
-      response = client.post(endpoint: '', body: remote_flag.content)
+      uri = URI.parse(inbox)
+      client = remote_flag.main_site.social_inbox.client_for(uri.origin)
+      response = client.post(endpoint: uri.path, body: remote_flag.content)
 
       raise 'No se pudo enviar el reporte' unless response.ok?
 
diff --git a/app/models/activity_pub/remote_flag.rb b/app/models/activity_pub/remote_flag.rb
index 70f09dcc..c3cc0fb0 100644
--- a/app/models/activity_pub/remote_flag.rb
+++ b/app/models/activity_pub/remote_flag.rb
@@ -2,8 +2,8 @@
 
 class ActivityPub
   class RemoteFlag < ApplicationRecord
-    IGNORED_EVENTS = []
-    IGNORED_STATES = []
+    IGNORED_EVENTS = [].freeze
+    IGNORED_STATES = [].freeze
 
     include AASM
 
@@ -42,10 +42,18 @@ class ActivityPub
         '@context' => 'https://www.w3.org/ns/activitystreams',
         'id' => Rails.application.routes.url_helpers.v1_activity_pub_remote_flag_url(self, host: site.social_inbox_hostname),
         'type' => 'Flag',
-        'actor' => ENV.fetch('PANEL_ACTOR_ID') { "https://#{ENV['SUTTY']}/about.jsonld" },
+        'actor' => main_site.social_inbox.actor_id,
         'content' => message.to_s,
-        'object' => [ actor.uri ] + objects.pluck(:uri)
+        'object' => [actor.uri] + objects.pluck(:uri)
       }
     end
+
+    # Este es el sitio principal que actúa como origen del reporte.
+    # Tiene que tener la Social Inbox habilitada al mismo tiempo.
+    #
+    # @return [Site]
+    def main_site
+      @main_site ||= Site.find(ENV.fetch('PANEL_ACTOR_SITE_ID') { 1 })
+    end
   end
 end