Moderation: add `force sensitive` and `force unlisted` actions. Accounts: add federatable `adult content` tag. Handle from remote accounts as well.

6 files changed, 73 insertions, 0 deletions

diff --git a/db/migrate/20190509183411_add_force_sensitive_to_domain_blocks.rb b/db/migrate/20190509183411_add_force_sensitive_to_domain_blocks.rb
new file mode 100644
index 000000000..c27fb0385
--- /dev/null
+++ b/db/migrate/20190509183411_add_force_sensitive_to_domain_blocks.rb
@@ -0,0 +1,16 @@
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+class AddForceSensitiveToDomainBlocks < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    safety_assured do
+      add_column_with_default :domain_blocks, :force_sensitive, :boolean, default: false, allow_null: false
+    end
+  end
+
+  def down
+    remove_column :domain_blocks, :force_sensitive
+  end
+end
diff --git a/db/migrate/20190509185038_add_network_index_to_statuses.rb b/db/migrate/20190509185038_add_network_index_to_statuses.rb
new file mode 100644
index 000000000..761cebfc8
--- /dev/null
+++ b/db/migrate/20190509185038_add_network_index_to_statuses.rb
@@ -0,0 +1,6 @@
+class AddNetworkIndexToStatuses < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+  def change
+    add_index :statuses, :network, where: :network, algorithm: :concurrently
+  end
+end
diff --git a/db/migrate/20190509190505_update_domain_block_severity_enum.rb b/db/migrate/20190509190505_update_domain_block_severity_enum.rb
new file mode 100644
index 000000000..90fbb7ebf
--- /dev/null
+++ b/db/migrate/20190509190505_update_domain_block_severity_enum.rb
@@ -0,0 +1,19 @@
+class UpdateDomainBlockSeverityEnum < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def up
+    DomainBlock.where(severity: :force_unlisted).each do |block|
+      block.severity = :suspend
+      block.save
+    end
+
+    DomainBlock.where(severity: :noop).each do |block|
+      block.severity = :silence
+      block.save
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20190509201242_add_force_options_to_accounts.rb b/db/migrate/20190509201242_add_force_options_to_accounts.rb
new file mode 100644
index 000000000..709efafaf
--- /dev/null
+++ b/db/migrate/20190509201242_add_force_options_to_accounts.rb
@@ -0,0 +1,8 @@
+class AddForceOptionsToAccounts < ActiveRecord::Migration[5.2]
+  def change
+    safety_assured {
+      add_column :accounts, :force_unlisted, :boolean, null: false, default: false
+      add_column :accounts, :force_sensitive, :boolean, null: false, default: false
+    }
+  end
+end
diff --git a/db/migrate/20190509201451_add_adults_only_to_accounts.rb b/db/migrate/20190509201451_add_adults_only_to_accounts.rb
new file mode 100644
index 000000000..179d28ef4
--- /dev/null
+++ b/db/migrate/20190509201451_add_adults_only_to_accounts.rb
@@ -0,0 +1,5 @@
+class AddAdultsOnlyToAccounts < ActiveRecord::Migration[5.2]
+  def change
+    safety_assured { add_column :accounts, :adults_only, :boolean, null: false, default: false }
+  end
+end
diff --git a/db/migrate/20190510071027_update_account_warning_action_enum.rb b/db/migrate/20190510071027_update_account_warning_action_enum.rb
new file mode 100644
index 000000000..b89fb60d2
--- /dev/null
+++ b/db/migrate/20190510071027_update_account_warning_action_enum.rb
@@ -0,0 +1,19 @@
+class UpdateAccountWarningActionEnum < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def up
+    AccountWarning.where(action: :force_unlisted).each do |warning|
+      warning.severity = :suspend
+      warning.save
+    end
+
+    AccountWarning.where(action: :force_sensitive).each do |warning|
+      warning.severity = :silence
+      warning.save
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end