From b90f8864461e3b2d8a5f725a0a81cd9f4cc858e7 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Tue, 19 Mar 2024 09:47:24 -0300
Subject: [PATCH 1/2] feat: fedipact

---
 app/models/activity_pub/fediblock.rb          |  4 +--
 ...240319124212_add_fedipact_to_fediblocks.rb | 25 +++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20240319124212_add_fedipact_to_fediblocks.rb

diff --git a/app/models/activity_pub/fediblock.rb b/app/models/activity_pub/fediblock.rb
index 4abcb80f..ec66c032 100644
--- a/app/models/activity_pub/fediblock.rb
+++ b/app/models/activity_pub/fediblock.rb
@@ -31,8 +31,8 @@ class ActivityPub
 
     class FediblockDownloadError < ::StandardError; end
 
-    validates_presence_of :title, :url, :download_url, :format
-    validates_inclusion_of :format, in: %w[mastodon fediblock]
+    validates_presence_of :title, :url, :format
+    validates_inclusion_of :format, in: %w[mastodon fediblock none]
 
     HOSTNAME_HEADERS = {
       'mastodon'  => '#domain',
diff --git a/db/migrate/20240319124212_add_fedipact_to_fediblocks.rb b/db/migrate/20240319124212_add_fedipact_to_fediblocks.rb
new file mode 100644
index 00000000..648f2ee7
--- /dev/null
+++ b/db/migrate/20240319124212_add_fedipact_to_fediblocks.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+# Agrega threads.net a las listas de bloqueo
+class AddFedipactToFediblocks < ActiveRecord::Migration[6.1]
+  def up
+    fedipact =
+      ActivityPub::Fediblock.create(
+        hostnames: %w[threads.net],
+        title: 'Fedipact',
+        url: 'https://fedipact.online/',
+        format: 'none'
+      )
+
+    DeploySocialDistributedPress.find_each do |deploy|
+      FediblockState.create(site: deploy.site, fediblock: fedipact, aasm_state: 'disabled').tap do |f|
+        f.enable!
+      end
+    end
+  end
+
+  def down
+    fedipact = ActivityPub::Fediblock.find_by(url: 'https://fedipact.online/').delete
+    FediblockState.where(fediblock_id: fedipact.id).delete_all
+  end
+end

From c047858a6f418a7bbf42eb5d3730a5ed114916c1 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Tue, 19 Mar 2024 09:49:34 -0300
Subject: [PATCH 2/2] fixup! feat: fedipact

---
 db/migrate/20240319124212_add_fedipact_to_fediblocks.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/db/migrate/20240319124212_add_fedipact_to_fediblocks.rb b/db/migrate/20240319124212_add_fedipact_to_fediblocks.rb
index 648f2ee7..d78439b2 100644
--- a/db/migrate/20240319124212_add_fedipact_to_fediblocks.rb
+++ b/db/migrate/20240319124212_add_fedipact_to_fediblocks.rb
@@ -3,6 +3,8 @@
 # Agrega threads.net a las listas de bloqueo
 class AddFedipactToFediblocks < ActiveRecord::Migration[6.1]
   def up
+    change_column :activity_pub_fediblocks, :download_url, :string, null: true
+
     fedipact =
       ActivityPub::Fediblock.create(
         hostnames: %w[threads.net],
@@ -21,5 +23,6 @@ class AddFedipactToFediblocks < ActiveRecord::Migration[6.1]
   def down
     fedipact = ActivityPub::Fediblock.find_by(url: 'https://fedipact.online/').delete
     FediblockState.where(fediblock_id: fedipact.id).delete_all
+    change_column :activity_pub_fediblocks, :download_url, :string, null: false
   end
 end