diff --git a/app/controllers/admin/domain_blocks_controller.rb b/app/controllers/admin/domain_blocks_controller.rb
index 557ad57bef..8a28410230 100644
--- a/app/controllers/admin/domain_blocks_controller.rb
+++ b/app/controllers/admin/domain_blocks_controller.rb
@@ -78,15 +78,15 @@ module Admin
     end
 
     def update_params
-      params.require(:domain_block).permit(:severity, :reject_media, :reject_favourite, :reject_reply, :reject_send_not_public_searchability, :reject_send_unlisted_dissubscribable, :reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow, :reject_new_follow, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous)
+      params.require(:domain_block).permit(:severity, :reject_media, :reject_favourite, :reject_reply, :reject_send_not_public_searchability, :reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow, :reject_new_follow, :detect_invalid_subscription, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous)
     end
 
     def resource_params
-      params.require(:domain_block).permit(:domain, :severity, :reject_media, :reject_favourite, :reject_reply, :reject_send_not_public_searchability, :reject_send_unlisted_dissubscribable, :reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow, :reject_new_follow, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous)
+      params.require(:domain_block).permit(:domain, :severity, :reject_media, :reject_favourite, :reject_reply, :reject_send_not_public_searchability, :reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow, :reject_new_follow, :detect_invalid_subscription, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous)
     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_send_not_public_searchability, :reject_send_unlisted_dissubscribable, :reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow, :reject_new_follow, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous])
+      params.require(:form_domain_block_batch).permit(domain_blocks_attributes: [:enabled, :domain, :severity, :reject_media, :reject_favourite, :reject_reply, :reject_send_not_public_searchability, :reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow, :reject_new_follow, :detect_invalid_subscription, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous])
     end
 
     def action_from_button
diff --git a/app/controllers/api/v1/admin/domain_blocks_controller.rb b/app/controllers/api/v1/admin/domain_blocks_controller.rb
index a981fba005..c2995902b9 100644
--- a/app/controllers/api/v1/admin/domain_blocks_controller.rb
+++ b/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_reports, :reject_send_not_public_searchability, :reject_send_unlisted_dissubscribable, :reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow, :reject_new_follow, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous)
+    params.permit(:severity, :reject_media, :reject_favourite, :reject_reply, :reject_reports, :reject_send_not_public_searchability, :reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow, :reject_new_follow, :detect_invalid_subscription, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous)
   end
 
   def insert_pagination_headers
@@ -101,6 +101,6 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController
   end
 
   def resource_params
-    params.permit(:domain, :severity, :reject_media, :reject_favourite, :reject_reply, :reject_send_not_public_searchability, :reject_send_unlisted_dissubscribable, :reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow, :reject_new_follow, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous)
+    params.permit(:domain, :severity, :reject_media, :reject_favourite, :reject_reply, :reject_send_not_public_searchability, :reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow, :reject_new_follow, :detect_invalid_subscription, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous)
   end
 end
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index f6e14ba853..e7a047369c 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -37,6 +37,8 @@ class Settings::PreferencesController < Settings::BaseController
       :setting_default_searchability,
       :setting_default_sensitive,
       :setting_public_post_to_unlisted,
+      :setting_reject_public_unlisted_subscription,
+      :setting_reject_unlisted_subscription,
       :setting_default_language,
       :setting_unfollow_modal,
       :setting_boost_modal,
diff --git a/app/lib/status_reach_finder.rb b/app/lib/status_reach_finder.rb
index be537896d3..56c3f6e49b 100644
--- a/app/lib/status_reach_finder.rb
+++ b/app/lib/status_reach_finder.rb
@@ -105,9 +105,10 @@ class StatusReachFinder
   def banned_domains_of_status(status)
     blocks = DomainBlock.where(domain: nil)
     blocks = blocks.or(DomainBlock.where(reject_send_not_public_searchability: true)) if status.compute_searchability != 'public'
-    blocks = blocks.or(DomainBlock.where(reject_send_unlisted_dissubscribable: true)) if status.unlisted_visibility? && status.account.dissubscribable
     blocks = blocks.or(DomainBlock.where(reject_send_public_unlisted: true)) if status.public_unlisted_visibility?
     blocks = blocks.or(DomainBlock.where(reject_send_dissubscribable: true)) if status.account.dissubscribable
+    blocks = blocks.or(DomainBlock.where(detect_invalid_subscription: true)) if status.public_unlisted_visibility? && status.account.user&.setting_reject_public_unlisted_subscription
+    blocks = blocks.or(DomainBlock.where(detect_invalid_subscription: true)) if status.unlisted_visibility? && status.account.user&.setting_reject_unlisted_subscription
     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
diff --git a/app/lib/user_settings_decorator.rb b/app/lib/user_settings_decorator.rb
index 28784b8857..3354c5fa23 100644
--- a/app/lib/user_settings_decorator.rb
+++ b/app/lib/user_settings_decorator.rb
@@ -21,6 +21,8 @@ class UserSettingsDecorator
     user.settings['default_searchability']=default_searchability_preference if change?('setting_default_searchability')
     user.settings['default_sensitive']   = default_sensitive_preference if change?('setting_default_sensitive')
     user.settings['public_post_to_unlisted']=public_post_to_unlisted_preference if change?('setting_public_post_to_unlisted')
+    user.settings['reject_public_unlisted_subscription'] = reject_public_unlisted_subscription_preference if change?('setting_reject_public_unlisted_subscription')
+    user.settings['reject_unlisted_subscription'] = reject_unlisted_subscription_preference if change?('setting_reject_unlisted_subscription')
     user.settings['default_language']    = default_language_preference if change?('setting_default_language')
     user.settings['unfollow_modal']      = unfollow_modal_preference if change?('setting_unfollow_modal')
     user.settings['boost_modal']         = boost_modal_preference if change?('setting_boost_modal')
@@ -68,6 +70,14 @@ class UserSettingsDecorator
     boolean_cast_setting 'setting_public_post_to_unlisted'
   end
 
+  def reject_public_unlisted_subscription_preference
+    boolean_cast_setting 'setting_reject_public_unlisted_subscription_preference'
+  end
+
+  def reject_unlisted_subscription_preference
+    boolean_cast_setting 'setting_reject_unlisted_subscription_preference'
+  end
+
   def unfollow_modal_preference
     boolean_cast_setting 'setting_unfollow_modal'
   end
diff --git a/app/models/account.rb b/app/models/account.rb
index c6a7cdd708..a6a65e2ae7 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -53,6 +53,7 @@
 #  group_allow_private_message   :boolean
 #  searchability                 :integer          default("private"), not null
 #  dissubscribable               :boolean          default(FALSE), not null
+#  stop_emoji_reaction_streaming :boolean          default(FALSE)
 #
 
 class Account < ApplicationRecord
diff --git a/app/models/account_statuses_filter.rb b/app/models/account_statuses_filter.rb
index d0a1cc5518..11750b8606 100644
--- a/app/models/account_statuses_filter.rb
+++ b/app/models/account_statuses_filter.rb
@@ -27,8 +27,8 @@ class AccountStatusesFilter
     scope.merge!(hashtag_scope)    if tagged?
 
     scope.merge!(scope.where(searchability: :public)) if domain_block&.reject_send_not_public_searchability
-    scope.merge!(scope.where.not(visibility: :unlisted)) if domain_block&.reject_send_unlisted_dissubscribable && @account.dissubscribable
-    scope.merge!(scope.where.not(visibility: :public_unlisted)) if domain_block&.reject_send_public_unlisted
+    scope.merge!(scope.where.not(visibility: :public_unlisted)) if domain_block&.reject_send_public_unlisted || (domain_block&.detect_invalid_subscription && @account.user&.setting_reject_public_unlisted_subscription)
+    scope.merge!(scope.where.not(visibility: :unlisted)) if domain_block&.detect_invalid_subscription && @account.user&.setting_unlisted_subscription
     scope.merge!(scope.where(spoiler_text: ['', nil])) if domain_block&.reject_send_sensitive
 
     scope
diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb
index f0cb28feec..512885ef27 100644
--- a/app/models/domain_block.rb
+++ b/app/models/domain_block.rb
@@ -17,7 +17,6 @@
 #  reject_favourite                     :boolean          default(FALSE), not null
 #  reject_reply                         :boolean          default(FALSE), not null
 #  reject_send_not_public_searchability :boolean          default(FALSE), not null
-#  reject_send_unlisted_dissubscribable :boolean          default(FALSE), not null
 #  reject_send_public_unlisted          :boolean          default(FALSE), not null
 #  reject_send_dissubscribable          :boolean          default(FALSE), not null
 #  reject_send_media                    :boolean          default(FALSE), not null
@@ -27,6 +26,7 @@
 #  reject_new_follow                    :boolean          default(FALSE), not null
 #  hidden                               :boolean          default(FALSE), not null
 #  hidden_anonymous                     :boolean          default(FALSE), not null
+#  detect_invalid_subscription          :boolean          default(FALSE), not null
 #
 
 class DomainBlock < ApplicationRecord
@@ -59,7 +59,6 @@ class DomainBlock < ApplicationRecord
        reject_favourite? ? :reject_favourite : nil,
        reject_reply? ? :reject_reply : nil,
        reject_send_not_public_searchability? ? :reject_send_not_public_searchability : nil,
-       reject_send_unlisted_dissubscribable? ? :reject_send_unlisted_dissubscribable : nil,
        reject_send_public_unlisted? ? :reject_send_public_unlisted : nil,
        reject_send_dissubscribable? ? :reject_send_dissubscribable : nil,
        reject_send_media? ? :reject_send_media : nil,
@@ -67,6 +66,7 @@ class DomainBlock < ApplicationRecord
        reject_hashtag? ? :reject_hashtag : nil,
        reject_straight_follow? ? :reject_straight_follow : nil,
        reject_new_follow? ? :reject_new_follow : nil,
+       detect_invalid_subscription? ? :detect_invalid_subscription : nil,
        reject_reports? ? :reject_reports : nil
       ].reject { |policy| policy == :noop || policy.nil? }
     end
diff --git a/app/models/user.rb b/app/models/user.rb
index b782a13fa1..0f945c7805 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -138,6 +138,7 @@ class User < ApplicationRecord
            :expand_spoilers, :default_language, :aggregate_reblogs, :show_application,
            :advanced_layout, :use_blurhash, :use_pending_items, :trends, :crop_images,
            :disable_swiping, :always_send_emails, :public_post_to_unlisted,
+           :reject_public_unlisted_subscription, :reject_unlisted_subscription,
            to: :settings, prefix: :setting, allow_nil: false
 
   delegate :can?, to: :role
diff --git a/app/policies/status_policy.rb b/app/policies/status_policy.rb
index 75b9b28eff..c67739eb5d 100644
--- a/app/policies/status_policy.rb
+++ b/app/policies/status_policy.rb
@@ -112,9 +112,10 @@ class StatusPolicy < ApplicationPolicy
     @domain_block ||= DomainBlock.find_by(domain: current_account&.domain)
     if @domain_block
       (@domain_block.reject_send_not_public_searchability && status.compute_searchability != 'public') ||
-      (@domain_block.reject_send_unlisted_dissubscribable && status.unlisted_visibility? && status.account.dissubscribable) ||
       (@domain_block.reject_send_public_unlisted && status.public_unlisted_visibility?) ||
       (@domain_block.reject_send_dissubscribable && status.account.dissubscribable) ||
+      (@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?))
     else
diff --git a/app/serializers/rest/admin/domain_block_serializer.rb b/app/serializers/rest/admin/domain_block_serializer.rb
index df167cec70..1177a23404 100644
--- a/app/serializers/rest/admin/domain_block_serializer.rb
+++ b/app/serializers/rest/admin/domain_block_serializer.rb
@@ -3,9 +3,9 @@
 class REST::Admin::DomainBlockSerializer < ActiveModel::Serializer
   attributes :id, :domain, :created_at, :severity,
              :reject_media, :reject_favourite, :reject_reply, :reject_reports,
-             :reject_send_not_public_searchability, :reject_send_unlisted_dissubscribable,
+             :reject_send_not_public_searchability,
              :reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media, :reject_send_sensitive,
-             :reject_hashtag, :reject_straight_follow, :reject_new_follow,
+             :reject_hashtag, :reject_straight_follow, :reject_new_follow, :detect_invalid_subscription,
              :private_comment, :public_comment, :obfuscate
 
   def id
diff --git a/app/views/admin/domain_blocks/edit.html.haml b/app/views/admin/domain_blocks/edit.html.haml
index aea62d51c8..b56237f618 100644
--- a/app/views/admin/domain_blocks/edit.html.haml
+++ b/app/views/admin/domain_blocks/edit.html.haml
@@ -26,9 +26,6 @@
   .fields-group
     = f.input :reject_send_not_public_searchability, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_send_not_public_searchability'), hint: I18n.t('admin.domain_blocks.reject_send_not_public_searchability_hint')
 
-  .fields-group
-    = f.input :reject_send_unlisted_dissubscribable, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_send_unlisted_dissubscribable'), hint: I18n.t('admin.domain_blocks.reject_send_unlisted_dissubscribable_hint')
-
   .fields-group
     = f.input :reject_send_dissubscribable, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_send_dissubscribable'), hint: I18n.t('admin.domain_blocks.reject_send_dissubscribable_hint')
 
@@ -50,6 +47,9 @@
   .fields-group
     = f.input :reject_new_follow, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_new_follow'), hint: I18n.t('admin.domain_blocks.reject_new_follow_hint')
 
+  .fields-group
+    = f.input :detect_invalid_subscription, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.detect_invalid_subscription'), hint: I18n.t('admin.domain_blocks.detect_invalid_subscription_hint')
+
   .fields-group
     = f.input :reject_reports, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_reports'), hint: I18n.t('admin.domain_blocks.reject_reports_hint')
 
diff --git a/app/views/admin/domain_blocks/new.html.haml b/app/views/admin/domain_blocks/new.html.haml
index 470cf52cea..b34038d10d 100644
--- a/app/views/admin/domain_blocks/new.html.haml
+++ b/app/views/admin/domain_blocks/new.html.haml
@@ -26,9 +26,6 @@
   .fields-group
     = f.input :reject_send_not_public_searchability, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_send_not_public_searchability'), hint: I18n.t('admin.domain_blocks.reject_send_not_public_searchability_hint')
 
-  .fields-group
-    = f.input :reject_send_unlisted_dissubscribable, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_send_unlisted_dissubscribable'), hint: I18n.t('admin.domain_blocks.reject_send_unlisted_dissubscribable_hint')
-
   .fields-group
     = f.input :reject_send_dissubscribable, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_send_dissubscribable'), hint: I18n.t('admin.domain_blocks.reject_send_dissubscribable_hint')
 
@@ -50,6 +47,9 @@
   .fields-group
     = f.input :reject_new_follow, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_new_follow'), hint: I18n.t('admin.domain_blocks.reject_new_follow_hint')
 
+  .fields-group
+    = f.input :detect_invalid_subscription, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.detect_invalid_subscription'), hint: I18n.t('admin.domain_blocks.detect_invalid_subscription_hint')
+
   .fields-group
     = f.input :reject_reports, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_reports'), hint: I18n.t('admin.domain_blocks.reject_reports_hint')
 
diff --git a/app/views/admin/export_domain_blocks/_domain_block.html.haml b/app/views/admin/export_domain_blocks/_domain_block.html.haml
index 8054b5ab2a..f38353aae5 100644
--- a/app/views/admin/export_domain_blocks/_domain_block.html.haml
+++ b/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_send_not_public_searchability
-      = f.hidden_field :reject_send_unlisted_dissubscribable
       = f.hidden_field :reject_send_public_unlisted
       = f.hidden_field :reject_send_dissubscribable
       = f.hidden_field :reject_send_media
@@ -21,6 +20,7 @@
       = f.hidden_field :reject_hashtag
       = f.hidden_field :reject_straight_follow
       = f.hidden_field :reject_new_follow
+      = f.hidden_field :detect_invalid_subscription
       = f.hidden_field :reject_reports
       = f.hidden_field :obfuscate
       = f.hidden_field :private_comment
diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml
index 8edcfb0b7f..69330e83cf 100644
--- a/app/views/settings/preferences/other/show.html.haml
+++ b/app/views/settings/preferences/other/show.html.haml
@@ -34,6 +34,12 @@
   .fields-group
     = f.input :setting_show_application, as: :boolean, wrapper: :with_label, recommended: true
 
+  .fields-group
+    = f.input :setting_reject_public_unlisted_subscription, as: :boolean, wrapper: :with_label
+
+  .fields-group
+    = f.input :setting_reject_unlisted_subscription, as: :boolean, wrapper: :with_label
+
   %h4= t 'preferences.public_timelines'
 
   .fields-group
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 527189dfa9..c74cad58b3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -389,6 +389,8 @@ en:
       add_new: Add new domain block
       created_msg: Domain block is now being processed
       destroyed_msg: Domain block has been undone
+      detect_invalid_subscription: 不正な購読を行うサーバーとしてマークする
+      detect_invalid_subscription_hint: Misskey、Calckeyなどは購読機能で未フォローユーザーの未収載投稿を拾います。これをマークしたサーバーは、ユーザーが任意で配送を拒否できます。停止とは無関係です
       domain: Domain
       edit: Edit domain block
       existing_domain_block: You have already imposed stricter limits on %{name}.
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index b861230170..e79ba26023 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -382,6 +382,8 @@ ja:
       add_new: ドメインブロックを追加
       created_msg: ドメインブロック処理を完了しました
       destroyed_msg: ドメインブロックを外しました
+      detect_invalid_subscription: 不正な購読を行うサーバーとしてマークする
+      detect_invalid_subscription_hint: Misskey、Calckeyなどは購読機能で未フォローユーザーの未収載投稿を拾います。これをマークしたサーバーは、ユーザーが任意で配送を拒否できます。停止とは無関係です
       domain: ドメイン
       edit: ドメインブロックを編集
       existing_domain_block: あなたは既に%{name}さんに厳しい制限を課しています。
@@ -499,6 +501,7 @@ ja:
         description_html: このドメインとそのサブドメインのすべてのアカウントに適用されるコンテンツポリシーを定義できます。
         limited_federation_mode_description_html: このドメインとの連合を許可するかどうかを選択できます。
         policies:
+          detect_invalid_subscription: 購読のプライバシーなし
           reject_favourite: お気に入りを拒否
           reject_hashtag: ハッシュタグを拒否
           reject_media: メディアを拒否する
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 73b780a478..4d5fd1dbc0 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -222,6 +222,8 @@ en:
         setting_noindex: Opt-out of search engine indexing
         setting_public_post_to_unlisted: Convert public post to public unlisted if not using Web app
         setting_reduce_motion: Reduce motion in animations
+        setting_reject_public_unlisted_subscription: Reject sending public unlisted posts to Misskey, Calckey
+        setting_reject_unlisted_subscription: Reject sending unlisted posts to Misskey, Calckey
         setting_show_application: Disclose application used to send posts
         setting_system_font_ui: Use system's default font
         setting_theme: Site theme
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index 608f8cf458..545c0145b2 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -62,6 +62,7 @@ ja:
         setting_display_media_expand: Misskeyなどは4個を超えて投稿可能です。その追加分を最大8個まで表示します。kmyblueからアップロードはできません
         setting_noindex: 公開プロフィールおよび各投稿ページに影響します
         setting_public_post_to_unlisted: 未対応のサードパーティアプリからもローカル公開で投稿できますが、公開投稿はWeb以外できなくなります
+        setting_reject_unlisted_subscription: Misskeyやそのフォーク(Calckeyなど)は、フォローしていないアカウントの「未収載」投稿を **購読・検索** することができます。これはMastodonにおける「未収載」投稿の基本的な考え方、扱い方と矛盾します。そのようなサーバーのうち管理人が指定したものに、指定した公開範囲の投稿を配送しません。ただし構造上、完璧な配送停止は困難であること、ご理解ください
         setting_show_application: 投稿するのに使用したアプリが投稿の詳細ビューに表示されるようになります
         setting_use_blurhash: ぼかしはメディアの色を元に生成されますが、細部は見えにくくなっています
         setting_use_pending_items: 新着があってもタイムラインを自動的にスクロールしないようにします
@@ -224,6 +225,8 @@ ja:
         setting_noindex: 検索エンジンによるインデックスを拒否する
         setting_public_post_to_unlisted: サードパーティアプリから投稿するとき、公開投稿をローカル公開に変更する
         setting_reduce_motion: アニメーションの動きを減らす
+        setting_reject_public_unlisted_subscription: 管理者の指定したサーバーに「ローカル公開」投稿を配送しない
+        setting_reject_unlisted_subscription: 管理者の指定したサーバーに「未収載」投稿を配送しない
         setting_show_application: 送信したアプリを開示する
         setting_system_font_ui: システムのデフォルトフォントを使う
         setting_theme: サイトテーマ
diff --git a/db/migrate/20230430110057_add_reject_invalid_subscription_to_domain_blocks.rb b/db/migrate/20230430110057_add_reject_invalid_subscription_to_domain_blocks.rb
new file mode 100644
index 0000000000..b4c1458743
--- /dev/null
+++ b/db/migrate/20230430110057_add_reject_invalid_subscription_to_domain_blocks.rb
@@ -0,0 +1,8 @@
+class AddRejectInvalidSubscriptionToDomainBlocks < ActiveRecord::Migration[6.1]
+  def change
+    safety_assured do
+      remove_column :domain_blocks, :reject_send_unlisted_dissubscribable, :boolean, null: false, default: false
+    end
+    add_column :domain_blocks, :detect_invalid_subscription, :boolean, null: false, default: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5779eaac91..cb06360258 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_04_27_233749) do
+ActiveRecord::Schema.define(version: 2023_04_30_110057) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -192,6 +192,7 @@ ActiveRecord::Schema.define(version: 2023_04_27_233749) do
     t.boolean "group_allow_private_message"
     t.integer "searchability", default: 2, null: false
     t.boolean "dissubscribable", default: false, null: false
+    t.boolean "stop_emoji_reaction_streaming", default: false
     t.index "(((setweight(to_tsvector('simple'::regconfig, (display_name)::text), 'A'::\"char\") || setweight(to_tsvector('simple'::regconfig, (username)::text), 'B'::\"char\")) || setweight(to_tsvector('simple'::regconfig, (COALESCE(domain, ''::character varying))::text), 'C'::\"char\")))", name: "search_index", using: :gin
     t.index "lower((username)::text), COALESCE(lower((domain)::text), ''::text)", name: "index_accounts_on_username_and_domain_lower", unique: true
     t.index ["moved_to_account_id"], name: "index_accounts_on_moved_to_account_id", where: "(moved_to_account_id IS NOT NULL)"
@@ -471,7 +472,6 @@ ActiveRecord::Schema.define(version: 2023_04_27_233749) do
     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_unlisted_dissubscribable", 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
@@ -481,6 +481,7 @@ ActiveRecord::Schema.define(version: 2023_04_27_233749) do
     t.boolean "reject_new_follow", default: false, null: false
     t.boolean "hidden", default: false, null: false
     t.boolean "hidden_anonymous", default: false, null: false
+    t.boolean "detect_invalid_subscription", default: false, null: false
     t.index ["domain"], name: "index_domain_blocks_on_domain", unique: true
   end