Remove: メディアを配送しない設定の削除 (#445)

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_media, :reject_send_sensitive, :reject_hashtag,
+      params.require(:domain_block).permit(:severity, :reject_media, :reject_favourite, :reject_reply, :reject_reply_exclude_followers, :reject_send_sensitive, :reject_hashtag,
                                            :reject_straight_follow, :reject_new_follow, :reject_friend, :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_media, :reject_send_sensitive, :reject_hashtag,
+      params.require(:domain_block).permit(:domain, :severity, :reject_media, :reject_favourite, :reject_reply, :reject_reply_exclude_followers, :reject_send_sensitive, :reject_hashtag,
                                            :reject_straight_follow, :reject_new_follow, :reject_friend, :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, :reject_send_media,
+      params.require(:form_domain_block_batch).permit(domain_blocks_attributes: [:enabled, :domain, :severity, :reject_media, :reject_favourite, :reject_reply, :reject_reply_exclude_followers,
                                                                                  :reject_send_sensitive, :reject_hashtag, :reject_straight_follow, :reject_new_follow, :reject_friend, :detect_invalid_subscription, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden])
     end
 

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_media, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow,
+    params.permit(:severity, :reject_media, :reject_favourite, :reject_reply, :reject_reply_exclude_followers, :reject_reports, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow,
                   :reject_new_follow, :reject_friend, :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_media, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow,
+    params.permit(:domain, :severity, :reject_media, :reject_favourite, :reject_reply, :reject_reply_exclude_followers, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow,
                   :reject_new_follow, :reject_friend, :detect_invalid_subscription, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden)
   end
 end

app/lib/account_statuses_filter.rb

@@ -45,7 +45,7 @@ class AccountStatusesFilter
   def initial_scope
     return Status.none if account.unavailable?
 
-    if domain_block&.reject_send_media || blocked?
+    if blocked?
       Status.none
     elsif anonymous?
       account.statuses.where(visibility: %i(public unlisted public_unlisted))

app/lib/status_reach_finder.rb

@@ -195,7 +195,6 @@ class StatusReachFinder
       []
     else
       blocks = DomainBlock.where(domain: nil)
-      blocks = blocks.or(DomainBlock.where(reject_send_media: true)) if status.with_media?
       blocks = blocks.or(DomainBlock.where(reject_send_sensitive: true)) if (status.with_media? && status.sensitive) || status.spoiler_text?
       blocks.pluck(:domain).uniq
     end

app/models/domain_block.rb

@@ -69,7 +69,6 @@ class DomainBlock < ApplicationRecord
        reject_favourite? ? :reject_favourite : nil,
        reject_reply? ? :reject_reply : nil,
        reject_reply_exclude_followers? ? :reject_reply_exclude_followers : nil,
-       reject_send_media? ? :reject_send_media : nil,
        reject_send_sensitive? ? :reject_send_sensitive : nil,
        reject_hashtag? ? :reject_hashtag : nil,
        reject_straight_follow? ? :reject_straight_follow : nil,

app/policies/status_policy.rb

@@ -149,7 +149,6 @@ class StatusPolicy < ApplicationPolicy
       else
         (@domain_block.detect_invalid_subscription && status.public_unlisted_visibility? && status.account.user&.setting_reject_public_unlisted_subscription) ||
           (@domain_block.detect_invalid_subscription && status.public_visibility? && status.account.user&.setting_reject_unlisted_subscription) ||
-          (@domain_block.reject_send_media && status.with_media?) ||
           (@domain_block.reject_send_sensitive && ((status.with_media? && status.sensitive) || status.spoiler_text?))
       end
     else

app/serializers/rest/admin/domain_block_serializer.rb

@@ -3,8 +3,7 @@
 class REST::Admin::DomainBlockSerializer < ActiveModel::Serializer
   attributes :id, :domain, :created_at, :severity,
              :reject_media, :reject_favourite, :reject_reply, :reject_reports,
-             :reject_reply_exclude_followers,
+             :reject_reply_exclude_followers, :reject_send_sensitive,
-             :reject_send_media, :reject_send_sensitive,
              :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

@@ -28,8 +28,5 @@
 
 %h4= I18n.t('admin.domain_blocks.headers.disagreement')
 
-.fields-group
-  = f.input :reject_send_media, as: :boolean, kmyblue: true, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_send_media'), hint: I18n.t('admin.domain_blocks.reject_send_media_hint')
-
 .fields-group
   = f.input :reject_send_sensitive, as: :boolean, kmyblue: true, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_send_sensitive'), hint: I18n.t('admin.domain_blocks.reject_send_sensitive_hint')

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

@@ -13,7 +13,6 @@
       = f.hidden_field :reject_favourite
       = f.hidden_field :reject_reply
       = f.hidden_field :reject_reply_exclude_followers
-      = f.hidden_field :reject_send_media
       = f.hidden_field :reject_send_sensitive
       = f.hidden_field :reject_hashtag
       = f.hidden_field :reject_straight_follow

config/locales/en.yml

@@ -454,8 +454,6 @@ en:
       reject_reply_exclude_followers_hint: Reject replies exclude followers in the future
       reject_reports: Reject reports
       reject_reports_hint: Ignore all reports coming from this domain. Irrelevant for suspensions
-      reject_send_media: 画像付き投稿を配送しない
-      reject_send_media_hint: 相手サーバーからのフェッチは防げません。停止とは無関係です
       reject_send_sensitive: センシティブな投稿を配送しない
       reject_send_sensitive_hint: 相手サーバーからのフェッチは防げません。停止とは無関係です
       reject_send_unlisted_dissubscribable: 購読拒否アカウントの未収載投稿を配送しない

config/locales/ja.yml

@@ -449,8 +449,6 @@ ja:
       reject_reply_exclude_followers_hint: 今後のリプライを拒否します。停止とは無関係です
       reject_reports: 通報を拒否
       reject_reports_hint: このドメインからの通報をすべて無視します。停止とは無関係です
-      reject_send_media: 画像付き投稿を配送しない
-      reject_send_media_hint: 相手サーバーからのフェッチは防げません。停止とは無関係です
       reject_send_sensitive: センシティブな投稿を配送しない
       reject_send_sensitive_hint: 相手サーバーからのフェッチは防げません。停止とは無関係です
       reject_send_unlisted_dissubscribable: 購読拒否アカウントの未収載投稿を配送しない
@@ -562,7 +560,6 @@ ja:
           reject_reply: リプライを拒否
           reject_reply_exclude_followers: フォロー相手以外からのリプライを拒否
           reject_reports: 通報を拒否
-          reject_send_media: メディア付き投稿配送なし
           reject_send_sensitive: センシティブ投稿配送なし
           reject_send_unlisted_dissubscribable: 購読拒否未収載投稿配送なし
           reject_straight_follow: フォローを制限

spec/requests/api/v1/admin/domain_blocks_spec.rb

@@ -62,7 +62,6 @@ RSpec.describe 'Domain Blocks' do
             reject_new_follow: domain_block.reject_new_follow,
             reject_reply: domain_block.reject_reply,
             reject_reply_exclude_followers: domain_block.reject_reply_exclude_followers,
-            reject_send_media: domain_block.reject_send_media,
             reject_send_sensitive: domain_block.reject_send_sensitive,
             reject_straight_follow: domain_block.reject_straight_follow,
             reject_friend: domain_block.reject_friend,
@@ -112,7 +111,6 @@ RSpec.describe 'Domain Blocks' do
         reject_new_follow: domain_block.reject_new_follow,
         reject_reply: domain_block.reject_reply,
         reject_reply_exclude_followers: domain_block.reject_reply_exclude_followers,
-        reject_send_media: domain_block.reject_send_media,
         reject_send_sensitive: domain_block.reject_send_sensitive,
         reject_straight_follow: domain_block.reject_straight_follow,
         reject_friend: domain_block.reject_friend,
@@ -144,7 +142,6 @@ RSpec.describe 'Domain Blocks' do
           reject_new_follow: domain_block.reject_new_follow,
           reject_reply: domain_block.reject_reply,
           reject_reply_exclude_followers: domain_block.reject_reply_exclude_followers,
-          reject_send_media: domain_block.reject_send_media,
           reject_send_sensitive: domain_block.reject_send_sensitive,
           reject_straight_follow: domain_block.reject_straight_follow,
           reject_friend: domain_block.reject_friend,