Remove: #608 ドメインブロック「リプライを拒否」 (#624)

app/controllers/admin/domain_blocks_controller.rb

@@ -88,17 +88,17 @@ module Admin
     end
 
     def update_params
-      params.require(:domain_block).permit(:severity, :reject_media, :reject_favourite, :reject_reply, :reject_reply_exclude_followers, :reject_send_sensitive, :reject_hashtag,
+      params.require(:domain_block).permit(:severity, :reject_media, :reject_favourite, :reject_reply_exclude_followers, :reject_send_sensitive, :reject_hashtag,
                                            :reject_straight_follow, :reject_new_follow, :reject_friend, :block_trends, :detect_invalid_subscription, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden)
     end
 
     def resource_params
-      params.require(:domain_block).permit(:domain, :severity, :reject_media, :reject_favourite, :reject_reply, :reject_reply_exclude_followers, :reject_send_sensitive, :reject_hashtag,
+      params.require(:domain_block).permit(:domain, :severity, :reject_media, :reject_favourite, :reject_reply_exclude_followers, :reject_send_sensitive, :reject_hashtag,
                                            :reject_straight_follow, :reject_new_follow, :reject_friend, :block_trends, :detect_invalid_subscription, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden)
     end
 
     def form_domain_block_batch_params
-      params.require(:form_domain_block_batch).permit(domain_blocks_attributes: [:enabled, :domain, :severity, :reject_media, :reject_favourite, :reject_reply, :reject_reply_exclude_followers,
+      params.require(:form_domain_block_batch).permit(domain_blocks_attributes: [:enabled, :domain, :severity, :reject_media, :reject_favourite, :reject_reply_exclude_followers,
                                                                                  :reject_send_sensitive, :reject_hashtag, :reject_straight_follow, :reject_new_follow, :reject_friend, :block_trends, :detect_invalid_subscription,
                                                                                  :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden])
     end

app/controllers/admin/export_domain_blocks_controller.rb

@@ -38,7 +38,6 @@ module Admin
                                        public_comment: row['#public_comment'],
                                        obfuscate: row.fetch('#obfuscate', false),
                                        reject_favourite: row.fetch('#reject_favourite', false),
-                                       reject_reply: row.fetch('#reject_reply', false),
                                        reject_send_sensitive: row.fetch('#reject_send_sensitive', false),
                                        reject_hashtag: row.fetch('#reject_hashtag', false),
                                        reject_straight_follow: row.fetch('#reject_straight_follow', false),
@@ -86,7 +85,6 @@ module Admin
         #public_comment
         #obfuscate
         #reject_favourite
-        #reject_reply
         #reject_send_sensitive
         #reject_hashtag
         #reject_straight_follow
@@ -110,7 +108,6 @@ module Admin
             instance.public_comment,
             instance.obfuscate,
             instance.reject_favourite,
-            instance.reject_reply,
             instance.reject_send_sensitive,
             instance.reject_hashtag,
             instance.reject_straight_follow,

app/controllers/api/v1/admin/domain_blocks_controller.rb

@@ -69,7 +69,7 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController
   end
 
   def domain_block_params
-    params.permit(:severity, :reject_media, :reject_favourite, :reject_reply, :reject_reply_exclude_followers, :reject_reports, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow,
+    params.permit(:severity, :reject_media, :reject_favourite, :reject_reply_exclude_followers, :reject_reports, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow,
                   :reject_new_follow, :reject_friend, :block_trends, :detect_invalid_subscription, :private_comment, :public_comment, :obfuscate, :hidden)
   end
 
@@ -102,7 +102,7 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController
   end
 
   def resource_params
-    params.permit(:domain, :severity, :reject_media, :reject_favourite, :reject_reply, :reject_reply_exclude_followers, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow,
+    params.permit(:domain, :severity, :reject_media, :reject_favourite, :reject_reply_exclude_followers, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow,
                   :reject_new_follow, :reject_friend, :block_trends, :detect_invalid_subscription, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden)
   end
 end

app/lib/activitypub/activity/create.rb

@@ -91,7 +91,6 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     process_audience
 
     return nil unless valid_status?
-    return nil if (mention_to_local? || reference_to_local_account?) && reject_reply_to_local?
     return nil if (mention_to_local_stranger? || reference_to_local_stranger?) && reject_reply_exclude_followers?
 
     ApplicationRecord.transaction do
@@ -510,10 +509,6 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     !replied_to_status.nil? && replied_to_status.account.local?
   end
 
-  def mention_to_local?
-    mentioned_accounts.any?(&:local?)
-  end
-
   def mention_to_local_stranger?
     mentioned_accounts.any? { |account| account.local? && !account.following?(@account) }
   end
@@ -532,10 +527,6 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     local_referred_accounts.any? { |account| !account.following?(@account) }
   end
 
-  def reject_reply_to_local?
-    @reject_reply_to_local ||= DomainBlock.reject_reply?(@account.domain)
-  end
-
   def reject_reply_exclude_followers?
     @reject_reply_exclude_followers ||= DomainBlock.reject_reply_exclude_followers?(@account.domain)
   end

app/models/admin/import.rb

@@ -34,7 +34,7 @@ class Admin::Import
         field&.strip
       when '#severity'
         field&.strip&.to_sym
-      when '#reject_media', '#reject_reports', '#obfuscate', '#reject_favourite', '#reject_reply', '#reject_send_sensitive',
+      when '#reject_media', '#reject_reports', '#obfuscate', '#reject_favourite', '#reject_send_sensitive',
         '#reject_hashtag', '#reject_straight_follow', '#reject_new_follow', '#hidden', '#detect_invalid_subscription',
         '#reject_reply_exclude_followers', '#reject_friend', '#block_trends'
         ActiveModel::Type::Boolean.new.cast(field)

app/models/domain_block.rb

@@ -15,7 +15,6 @@
 #  public_comment                 :text
 #  obfuscate                      :boolean          default(FALSE), not null
 #  reject_favourite               :boolean          default(FALSE), not null
-#  reject_reply                   :boolean          default(FALSE), not null
 #  reject_send_sensitive          :boolean          default(FALSE), not null
 #  reject_hashtag                 :boolean          default(FALSE), not null
 #  reject_straight_follow         :boolean          default(FALSE), not null
@@ -44,7 +43,6 @@ class DomainBlock < ApplicationRecord
     where(severity: [:silence, :suspend])
       .or(where(reject_media: true))
       .or(where(reject_favourite: true))
-      .or(where(reject_reply: true))
       .or(where(reject_reply_exclude_followers: true))
       .or(where(reject_new_follow: true))
       .or(where(reject_straight_follow: true))
@@ -64,7 +62,6 @@ class DomainBlock < ApplicationRecord
       [severity.to_sym,
        reject_media? ? :reject_media : nil,
        reject_favourite? ? :reject_favourite : nil,
-       reject_reply? ? :reject_reply : nil,
        reject_reply_exclude_followers? ? :reject_reply_exclude_followers : nil,
        reject_send_sensitive? ? :reject_send_sensitive : nil,
        reject_hashtag? ? :reject_hashtag : nil,
@@ -94,10 +91,6 @@ class DomainBlock < ApplicationRecord
       !!rule_for(domain)&.reject_favourite?
     end
 
-    def reject_reply?(domain)
-      !!rule_for(domain)&.reject_reply?
-    end
-
     def reject_reply_exclude_followers?(domain)
       !!rule_for(domain)&.reject_reply_exclude_followers?
     end
@@ -150,7 +143,7 @@ class DomainBlock < ApplicationRecord
     return false if other_block.suspend? && (silence? || noop?)
     return false if other_block.silence? && noop?
 
-    (reject_media || !other_block.reject_media) && (reject_favourite || !other_block.reject_favourite) && (reject_reply || !other_block.reject_reply) && (reject_reply_exclude_followers || !other_block.reject_reply_exclude_followers) && (reject_reports || !other_block.reject_reports)
+    (reject_media || !other_block.reject_media) && (reject_favourite || !other_block.reject_favourite) && (reject_reply_exclude_followers || !other_block.reject_reply_exclude_followers) && (reject_reports || !other_block.reject_reports)
   end
 
   def public_domain

app/serializers/rest/admin/domain_block_serializer.rb

@@ -2,7 +2,7 @@
 
 class REST::Admin::DomainBlockSerializer < ActiveModel::Serializer
   attributes :id, :domain, :digest, :created_at, :severity,
-             :reject_media, :reject_favourite, :reject_reply, :reject_reports,
+             :reject_media, :reject_favourite, :reject_reports,
              :reject_reply_exclude_followers, :reject_send_sensitive, :block_trends,
              :reject_hashtag, :reject_straight_follow, :reject_new_follow, :reject_friend, :detect_invalid_subscription,
              :private_comment, :public_comment, :obfuscate

app/views/admin/domain_blocks/_domain_block_list.html.haml

@@ -3,9 +3,6 @@
 .fields-group
   = f.input :reject_favourite, as: :boolean, kmyblue: true, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_favourite'), hint: I18n.t('admin.domain_blocks.reject_favourite_hint')
 
-.fields-group
-  = f.input :reject_reply, as: :boolean, kmyblue: true, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_reply'), hint: I18n.t('admin.domain_blocks.reject_reply_hint')
-
 .fields-group
   = f.input :reject_reply_exclude_followers, as: :boolean, kmyblue: true, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_reply_exclude_followers'), hint: I18n.t('admin.domain_blocks.reject_reply_exclude_followers_hint')
 

app/views/admin/export_domain_blocks/_domain_block.html.haml

@@ -11,7 +11,6 @@
       = f.hidden_field :severity
       = f.hidden_field :reject_media
       = f.hidden_field :reject_favourite
-      = f.hidden_field :reject_reply
       = f.hidden_field :reject_reply_exclude_followers
       = f.hidden_field :reject_send_sensitive
       = f.hidden_field :reject_hashtag