Remove: #372 ドメインブロックにおいて、DBの不要なカラムを削除 (#471)

app/models/domain_block.rb

@@ -4,30 +4,26 @@
 #
 # Table name: domain_blocks
 #
-#  id                                   :bigint(8)        not null, primary key
+#  id                             :bigint(8)        not null, primary key
-#  domain                               :string           default(""), not null
+#  domain                         :string           default(""), not null
-#  created_at                           :datetime         not null
+#  created_at                     :datetime         not null
-#  updated_at                           :datetime         not null
+#  updated_at                     :datetime         not null
-#  severity                             :integer          default("silence")
+#  severity                       :integer          default("silence")
-#  reject_media                         :boolean          default(FALSE), not null
+#  reject_media                   :boolean          default(FALSE), not null
-#  reject_reports                       :boolean          default(FALSE), not null
+#  reject_reports                 :boolean          default(FALSE), not null
-#  private_comment                      :text
+#  private_comment                :text
-#  public_comment                       :text
+#  public_comment                 :text
-#  obfuscate                            :boolean          default(FALSE), not null
+#  obfuscate                      :boolean          default(FALSE), not null
-#  reject_favourite                     :boolean          default(FALSE), not null
+#  reject_favourite               :boolean          default(FALSE), not null
-#  reject_reply                         :boolean          default(FALSE), not null
+#  reject_reply                   :boolean          default(FALSE), not null
-#  reject_send_not_public_searchability :boolean          default(FALSE), not null
+#  reject_send_sensitive          :boolean          default(FALSE), not null
-#  reject_send_public_unlisted          :boolean          default(FALSE), not null
+#  reject_hashtag                 :boolean          default(FALSE), not null
-#  reject_send_dissubscribable          :boolean          default(FALSE), not null
+#  reject_straight_follow         :boolean          default(FALSE), not null
-#  reject_send_media                    :boolean          default(FALSE), not null
+#  reject_new_follow              :boolean          default(FALSE), not null
-#  reject_send_sensitive                :boolean          default(FALSE), not null
+#  hidden                         :boolean          default(FALSE), not null
-#  reject_hashtag                       :boolean          default(FALSE), not null
+#  detect_invalid_subscription    :boolean          default(FALSE), not null
-#  reject_straight_follow               :boolean          default(FALSE), not null
+#  reject_reply_exclude_followers :boolean          default(FALSE), not null
-#  reject_new_follow                    :boolean          default(FALSE), not null
+#  reject_friend                  :boolean          default(FALSE), not null
-#  hidden                               :boolean          default(FALSE), not null
-#  detect_invalid_subscription          :boolean          default(FALSE), not null
-#  reject_reply_exclude_followers       :boolean          default(FALSE), not null
-#  reject_friend                        :boolean          default(FALSE), not null
 #
 
 class DomainBlock < ApplicationRecord

config/locales/en.yml

@@ -456,8 +456,6 @@ en:
       reject_reports_hint: Ignore all reports coming from this domain. Irrelevant for suspensions
       reject_send_sensitive: センシティブな投稿を配送しない
       reject_send_sensitive_hint: 相手サーバーからのフェッチは防げません。停止とは無関係です
-      reject_send_unlisted_dissubscribable: 購読拒否アカウントの未収載投稿を配送しない
-      reject_send_unlisted_dissubscribable_hint: 相手サーバーからのフェッチは防げません。停止とは無関係です
       reject_straight_follow: Reject straight follow
       reject_straight_follow_hint: The server accounts must be authenticated when follow our accounts
       undo: Undo domain block

config/locales/ja.yml

@@ -451,8 +451,6 @@ ja:
       reject_reports_hint: このドメインからの通報をすべて無視します。停止とは無関係です
       reject_send_sensitive: センシティブな投稿を配送しない
       reject_send_sensitive_hint: 相手サーバーからのフェッチは防げません。停止とは無関係です
-      reject_send_unlisted_dissubscribable: 購読拒否アカウントの未収載投稿を配送しない
-      reject_send_unlisted_dissubscribable_hint: 相手サーバーからのフェッチは防げません。停止とは無関係です
       reject_straight_follow: フォローを強制的に審査制にする
       reject_straight_follow_hint: 相手からのフォローは当サーバーのアカウントの承認が必須になります
       undo: ドメインブロックを戻す
@@ -562,7 +560,6 @@ ja:
           reject_reply_exclude_followers: フォロー相手以外からのリプライを拒否
           reject_reports: 通報を拒否
           reject_send_sensitive: センシティブ投稿配送なし
-          reject_send_unlisted_dissubscribable: 購読拒否未収載投稿配送なし
           reject_straight_follow: フォローを制限
           silence: 制限
           suspend: サスペンド

db/post_migrate/20240117022353_remove_legacy_domain_block_columns.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class RemoveLegacyDomainBlockColumns < ActiveRecord::Migration[7.1]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def change
+    safety_assured do
+      remove_column :domain_blocks, :reject_send_not_public_searchability, :boolean, null: false, default: false
+      remove_column :domain_blocks, :reject_send_public_unlisted, :boolean, null: false, default: false
+      remove_column :domain_blocks, :reject_send_dissubscribable, :boolean, null: false, default: false
+      remove_column :domain_blocks, :reject_send_media, :boolean, null: false, default: false
+    end
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_01_17_021025) do
+ActiveRecord::Schema[7.1].define(version: 2024_01_17_022353) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -566,10 +566,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_17_021025) do
     t.boolean "obfuscate", default: false, null: false
     t.boolean "reject_favourite", default: false, null: false
     t.boolean "reject_reply", default: false, null: false
-    t.boolean "reject_send_not_public_searchability", default: false, null: false
-    t.boolean "reject_send_public_unlisted", default: false, null: false
-    t.boolean "reject_send_dissubscribable", default: false, null: false
-    t.boolean "reject_send_media", default: false, null: false
     t.boolean "reject_send_sensitive", default: false, null: false
     t.boolean "reject_hashtag", default: false, null: false
     t.boolean "reject_straight_follow", default: false, null: false

lib/tasks/dangerous.rake

@@ -78,6 +78,7 @@ namespace :dangerous do
       20230223102416
       20230222232121
       20240117021025
+      20240117022353
     )
     # Removed: account_groups
     target_tables = %w(
@@ -128,10 +129,10 @@ namespace :dangerous do
       %w(domain_blocks reject_new_follow),
       %w(domain_blocks reject_reply),
       %w(domain_blocks reject_reply_exclude_followers),
-      %w(domain_blocks reject_send_dissubscribable),
+      # Removed: domain_blocks reject_send_dissubscribable
-      %w(domain_blocks reject_send_media),
+      # Removed: domain_blocks reject_send_media
-      %w(domain_blocks reject_send_not_public_searchability),
+      # Removed: domain_blocks reject_send_not_public_searchability
-      %w(domain_blocks reject_send_public_unlisted),
+      # Removed: domain_blocks reject_send_public_unlisted
       # Removed: domain_blocks reject_send_unlisted_dissubscribable
       %w(domain_blocks reject_send_sensitive),
       %w(domain_blocks reject_straight_follow),