Merge branch 'kb_development' into kb_migration

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

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

app/javascript/mastodon/features/antenna_adder/components/account.jsx

@@ -18,8 +18,6 @@ const makeMapStateToProps = () => {
 };
 
 
-export default @connect(makeMapStateToProps)
-@injectIntl
 class Account extends ImmutablePureComponent {
 
   static propTypes = {
@@ -41,3 +39,5 @@ class Account extends ImmutablePureComponent {
   }
 
 }
+
+export default connect(makeMapStateToProps)(injectIntl(Account));

app/javascript/mastodon/features/antenna_adder/components/antenna.jsx

@@ -23,8 +23,6 @@ const mapDispatchToProps = (dispatch, { antennaId }) => ({
   onAdd: () => dispatch(addToAntennaAdder(antennaId)),
 });
 
-export default @connect(MapStateToProps, mapDispatchToProps)
-@injectIntl
 class Antenna extends ImmutablePureComponent {
 
   static propTypes = {
@@ -67,3 +65,5 @@ class Antenna extends ImmutablePureComponent {
   }
 
 }
+
+export default connect(MapStateToProps, mapDispatchToProps)(injectIntl(Antenna));

app/javascript/mastodon/features/antenna_adder/index.jsx

@@ -27,8 +27,6 @@ const mapDispatchToProps = dispatch => ({
   onReset: () => dispatch(resetAntennaAdder()),
 });
 
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
 class AntennaAdder extends ImmutablePureComponent {
 
   static propTypes = {
@@ -67,3 +65,5 @@ class AntennaAdder extends ImmutablePureComponent {
   }
 
 }
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(AntennaAdder));

app/lib/activitypub/tag_manager.rb

@@ -124,6 +124,24 @@ class ActivityPub::TagManager
       cc << COLLECTIONS[:public]
     end
 
+    cc = cc + cc_private_visibility(status)
+
+    cc
+  end
+
+  def cc_for_misskey(status)
+    if (status.account.user&.setting_reject_unlisted_subscription && status.visibility == 'unlisted') || (status.account.user&.setting_reject_public_unlisted_subscription && status.visibility == 'public_unlisted')
+      cc = cc_private_visibility(status)
+      cc << uri_for(status.reblog.account) if status.reblog?
+      return cc
+    end
+
+    cc(status)
+  end
+
+  def cc_private_visibility(status)
+    cc = []
+
     unless status.direct_visibility? || status.limited_visibility?
       if status.account.silenced?
         # Only notify followers if the account is locally silenced

app/lib/status_reach_finder.rb

@@ -13,6 +13,10 @@ class StatusReachFinder
     (reached_account_inboxes + followers_inboxes + relay_inboxes).uniq
   end
 
+  def inboxes_for_misskey
+    (reached_account_inboxes_for_misskey + followers_inboxes_for_misskey).uniq
+  end
+
   private
 
   def reached_account_inboxes
@@ -26,6 +30,14 @@ class StatusReachFinder
     end
   end
 
+  def reached_account_inboxes_for_misskey
+    if @status.reblog?
+      []
+    else
+      Account.where(id: reached_account_ids).where(domain: banned_domains_for_misskey).inboxes
+    end
+  end
+
   def reached_account_ids
     [
       replied_to_account_id,
@@ -70,7 +82,7 @@ class StatusReachFinder
 
   def followers_inboxes
     if @status.in_reply_to_local_account? && distributable?
-      @status.account.followers.or(@status.thread.account.followers.not_domain_blocked_by_account(@status.account)).inboxes
+      @status.account.followers.or(@status.thread.account.followers.not_domain_blocked_by_account(@status.account)).where.not(domain: banned_domains).inboxes
     elsif @status.direct_visibility? || @status.limited_visibility?
       []
     else
@@ -78,6 +90,16 @@ class StatusReachFinder
     end
   end
 
+  def followers_inboxes_for_misskey
+    if @status.in_reply_to_local_account? && distributable?
+      @status.account.followers.or(@status.thread.account.followers.not_domain_blocked_by_account(@status.account)).where(domain: banned_domains_for_misskey).inboxes
+    elsif @status.direct_visibility? || @status.limited_visibility?
+      []
+    else
+      @status.account.followers.where(domain: banned_domains_for_misskey).inboxes
+    end
+  end
+
   def relay_inboxes
     if @status.public_visibility?
       Relay.enabled.pluck(:inbox_url)
@@ -96,13 +118,38 @@ class StatusReachFinder
 
   def banned_domains
     return @banned_domains if @banned_domains
-    blocks = []
+
-    blocks << DomainBlock.where(reject_send_not_public_searchability: true).pluck(:domain) if @status.compute_searchability != 'public'
+    domains = banned_domains_of_status(@status)
-    blocks << DomainBlock.where(reject_send_unlisted_dissubscribable: true).pluck(:domain) if @status.unlisted_visibility? && @status.account.dissubscribable
+    domains = domains + banned_domains_of_status(@status.reblog) if @status.reblog? && @status.reblog.local?
-    blocks << DomainBlock.where(reject_send_public_unlisted: true).pluck(:domain) if @status.public_unlisted_visibility?
+    return @banned_domains = domains.uniq
-    blocks << DomainBlock.where(reject_send_dissubscribable: true).pluck(:domain) if @status.account.dissubscribable
+  end
-    blocks << DomainBlock.where(reject_send_media: true).pluck(:domain) if @status.with_media?
+
-    blocks << DomainBlock.where(reject_send_sensitive: true).pluck(:domain) if (@status.with_media? && @status.sensitive) || @status.spoiler_text
+  def banned_domains_of_status(status)
-    return @banned_domains = blocks.uniq
+    blocks = DomainBlock.where(domain: nil)
+    unless status.account.user&.setting_send_without_domain_blocks
+      blocks = blocks.or(DomainBlock.where(reject_send_not_public_searchability: true)) if status.compute_searchability != 'public'
+      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(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?
+    end
+    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.pluck(:domain).uniq
+  end
+
+  def banned_domains_for_misskey
+    return @banned_domains_for_misskey if @banned_domains_for_misskey
+
+    domains = banned_domains_for_misskey_of_status(@status)
+    domains = domains + banned_domains_for_misskey_of_status(@status.reblog) if @status.reblog? && @status.reblog.local?
+    return @banned_domains_for_misskey = domains.uniq
+  end
+
+  def banned_domains_for_misskey_of_status(status)
+    blocks = DomainBlock.where(domain: nil)
+    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.pluck(:domain).uniq
   end
 end

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

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 || (domain_block&.detect_invalid_subscription && @account.user&.setting_reject_public_unlisted_subscription)
-    scope.merge!(scope.where.not(visibility: :public_unlisted)) if domain_block&.reject_send_public_unlisted
+    scope.merge!(scope.where.not(visibility: :unlisted)) if domain_block&.detect_invalid_subscription && @account.user&.setting_reject_unlisted_subscription
     scope.merge!(scope.where(spoiler_text: ['', nil])) if domain_block&.reject_send_sensitive
 
     scope

app/models/concerns/has_user_settings.rb

@@ -31,6 +31,18 @@ module HasUserSettings
     settings['public_post_to_unlisted']
   end
 
+  def setting_reject_public_unlisted_subscription
+    settings['reject_public_unlisted_subscription']
+  end
+
+  def setting_reject_unlisted_subscription
+    settings['reject_unlisted_subscription']
+  end
+
+  def setting_send_without_domain_blocks
+    settings['send_without_domain_blocks']
+  end
+
   def setting_unfollow_modal
     settings['web.unfollow_modal']
   end

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

app/models/user_settings.rb

@@ -17,6 +17,9 @@ class UserSettings
   setting :default_privacy, default: nil
   setting :default_searchability, default: :private
   setting :public_post_to_unlisted, default: false
+  setting :reject_public_unlisted_subscription, default: false
+  setting :reject_unlisted_subscription, default: false
+  setting :send_without_domain_blocks, default: false
 
   namespace :web do
     setting :crop_images, default: true

app/policies/status_policy.rb

@@ -101,14 +101,28 @@ class StatusPolicy < ApplicationPolicy
   end
 
   def server_blocking_domain?
-    @domain_block = DomainBlock.find_by(domain: current_account&.domain)
+    if record.reblog? && record.reblog.local?
+      server_blocking_domain_of_status?(record) || server_blocking_domain_of_status?(record.reblog)
+    else
+      server_blocking_domain_of_status?(record)
+    end
+  end
+
+  def server_blocking_domain_of_status?(status)
+    @domain_block ||= DomainBlock.find_by(domain: current_account&.domain)
     if @domain_block
-      (@domain_block.reject_send_not_public_searchability && record.compute_searchability != 'public') ||
+      unless status.account.user&.setting_send_without_domain_blocks
-      (@domain_block.reject_send_unlisted_dissubscribable && record.unlisted_visibility? && record.account.dissubscribable) ||
+        (@domain_block.reject_send_not_public_searchability && status.compute_searchability != 'public') ||
-      (@domain_block.reject_send_public_unlisted && record.public_unlisted_visibility?) ||
+        (@domain_block.reject_send_public_unlisted && status.public_unlisted_visibility?) ||
-      (@domain_block.reject_send_dissubscribable && record.account.dissubscribable) ||
+        (@domain_block.reject_send_dissubscribable && status.account.dissubscribable) ||
-      (@domain_block.reject_send_media && record.with_media?) ||
+        (@domain_block.detect_invalid_subscription && status.public_unlisted_visibility? && status.account.user&.setting_reject_public_unlisted_subscription) ||
-      (@domain_block.reject_send_sensitive && ((record.with_media? && record.sensitive) || record.spoiler_text))
+        (@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
+        (@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)
+      end
     else
       false
     end

app/presenters/activitypub/activity_presenter.rb

@@ -4,14 +4,14 @@ class ActivityPub::ActivityPresenter < ActiveModelSerializers::Model
   attributes :id, :type, :actor, :published, :to, :cc, :virtual_object
 
   class << self
-    def from_status(status, allow_inlining: true)
+    def from_status(status, allow_inlining: true, for_misskey: false)
       new.tap do |presenter|
         presenter.id        = ActivityPub::TagManager.instance.activity_uri_for(status)
         presenter.type      = status.reblog? ? 'Announce' : 'Create'
         presenter.actor     = ActivityPub::TagManager.instance.uri_for(status.account)
         presenter.published = status.created_at
         presenter.to        = ActivityPub::TagManager.instance.to(status)
-        presenter.cc        = ActivityPub::TagManager.instance.cc(status)
+        presenter.cc        = for_misskey ? ActivityPub::TagManager.instance.cc_for_misskey(status) : ActivityPub::TagManager.instance.cc(status)
 
         presenter.virtual_object = begin
           if status.reblog?

app/serializers/activitypub/activity_for_misskey_serializer.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class ActivityPub::ActivityForMisskeySerializer < ActivityPub::Serializer
+  def self.serializer_for(model, options)
+    case model.class.name
+    when 'Status'
+      ActivityPub::NoteForMisskeySerializer
+    when 'DeliverToDeviceService::EncryptedMessage'
+      ActivityPub::EncryptedMessageSerializer
+    else
+      super
+    end
+  end
+
+  attributes :id, :type, :actor, :published, :to, :cc
+
+  has_one :virtual_object, key: :object
+
+  def published
+    object.published.iso8601
+  end
+end

app/serializers/activitypub/note_for_misskey_serializer.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class ActivityPub::NoteForMisskeySerializer < ActivityPub::NoteSerializer
+
+  def cc
+    ActivityPub::TagManager.instance.cc_for_misskey(object)
+  end
+
+end

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

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')
 

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')
 

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

app/views/settings/preferences/other/show.html.haml

@@ -35,6 +35,15 @@
     .fields-group
       = ff.input :show_application, wrapper: :with_label, recommended: true, label: I18n.t('simple_form.labels.defaults.setting_show_application'), hint: I18n.t('simple_form.hints.defaults.setting_show_application')
 
+  .fields-group
+    = f.input :setting_send_without_domain_blocks, as: :boolean, wrapper: :with_label
+
+  .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

app/workers/activitypub/distribution_worker.rb

@@ -15,17 +15,33 @@ class ActivityPub::DistributionWorker < ActivityPub::RawDistributionWorker
   protected
 
   def inboxes
-    @inboxes ||= StatusReachFinder.new(@status).inboxes
+    @inboxes ||= status_reach_finder.inboxes
+  end
+
+  def inboxes_for_misskey
+    @inboxes_for_misskey ||= status_reach_finder.inboxes_for_misskey
+  end
+
+  def status_reach_finder
+    @status_reach_finder ||= StatusReachFinder.new(@status)
   end
 
   def payload
     @payload ||= Oj.dump(serialize_payload(activity, ActivityPub::ActivitySerializer, signer: @account))
   end
 
+  def payload_for_misskey
+    @payload_for_misskey ||= Oj.dump(serialize_payload(activity_for_misskey, ActivityPub::ActivityForMisskeySerializer, signer: @account))
+  end
+
   def activity
     ActivityPub::ActivityPresenter.from_status(@status)
   end
 
+  def activity_for_misskey
+    ActivityPub::ActivityPresenter.from_status(@status, for_misskey: true)
+  end
+
   def options
     { 'synchronize_followers' => @status.private_visibility? }
   end

app/workers/activitypub/raw_distribution_worker.rb

@@ -23,10 +23,16 @@ class ActivityPub::RawDistributionWorker
   protected
 
   def distribute!
-    return if inboxes.empty?
+    unless inboxes.empty?
+      ActivityPub::DeliveryWorker.push_bulk(inboxes, limit: 1_000) do |inbox_url|
+        [payload, source_account_id, inbox_url, options]
+      end
+    end
 
-    ActivityPub::DeliveryWorker.push_bulk(inboxes, limit: 1_000) do |inbox_url|
+    unless inboxes_for_misskey.empty?
-      [payload, source_account_id, inbox_url, options]
+      ActivityPub::DeliveryWorker.push_bulk(inboxes_for_misskey, limit: 1_000) do |inbox_url|
+        [payload_for_misskey, source_account_id, inbox_url, options]
+      end
     end
   end
 
@@ -34,6 +40,10 @@ class ActivityPub::RawDistributionWorker
     @json
   end
 
+  def payload_for_misskey
+    payload
+  end
+
   def source_account_id
     @account.id
   end
@@ -42,6 +52,10 @@ class ActivityPub::RawDistributionWorker
     @inboxes ||= @account.followers.inboxes - @exclude_inboxes
   end
 
+  def inboxes_for_misskey
+    []
+  end
+
   def options
     {}
   end

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}.

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: メディアを拒否する

config/locales/simple_form.en.yml

@@ -222,6 +222,9 @@ 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_send_without_domain_blocks: Send your post to all server with administrator set as rejecting-post-server for protect you [DEPRECATED]
         setting_show_application: Disclose application used to send posts
         setting_system_font_ui: Use system's default font
         setting_theme: Site theme

config/locales/simple_form.ja.yml

@@ -38,7 +38,7 @@ ja:
         current_username: 確認のため、現在のアカウントのユーザー名を入力してください
         digest: 長期間使用していない場合と不在時に返信を受けた場合のみ送信されます
         discoverable: レコメンド、トレンド、その他の機能により、あなたのアカウントを他の人から見つけられるようにします
-        dissubscribable: あなたの投稿はすべてのアンテナに掲載されなくなります。Fedibirdからの購読やMisskeyのアンテナを拒否することはできません
+        dissubscribable: あなたの投稿はすべてのアンテナに掲載されなくなります。Misskeyのアンテナを拒否することはできません。Mastodonの一部のサーバーもこの設定に対応しますが、挙動が一部kmyblueと異なる場合があります
         email: 確認のメールが送信されます
         fields: プロフィールに表として4つまでの項目を表示することができます
         group: このアカウントに送られたメンションは自動でBTされ、フォローしている全てのアカウントに配信されます
@@ -52,6 +52,7 @@ ja:
         person: これは人が使用している通常のアカウントです
         phrase: 投稿内容の大文字小文字や閲覧注意に関係なく一致
         scopes: アプリの API に許可するアクセス権を選択してください。最上位のスコープを選択する場合、個々のスコープを選択する必要はありません。
+        setting_send_without_domain_blocks: 管理人が同人コンテンツの配送にふさわしくないと判断したサーバーに、制限に関係なく全ての投稿を配送します。ただし何が起きても自己責任になります
         setting_aggregate_reblogs: 最近ブーストされた投稿が新たにブーストされても表示しません (設定後受信したものにのみ影響)
         setting_always_send_emails: 通常、Mastodon からメール通知は行われません。
         setting_default_sensitive: 閲覧注意状態のメディアはデフォルトでは内容が伏せられ、クリックして初めて閲覧できるようになります
@@ -62,6 +63,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 +226,9 @@ ja:
         setting_noindex: 検索エンジンによるインデックスを拒否する
         setting_public_post_to_unlisted: サードパーティアプリから投稿するとき、公開投稿をローカル公開に変更する
         setting_reduce_motion: アニメーションの動きを減らす
+        setting_reject_public_unlisted_subscription: 管理者の指定したサーバーに「ローカル公開」投稿を「フォロワーのみ」に変換して配送する
+        setting_reject_unlisted_subscription: 管理者の指定したサーバーに「未収載」投稿を「フォロワーのみ」に変換して配送する
+        setting_send_without_domain_blocks: 管理人の設定した配送停止設定を拒否する (非推奨)
         setting_show_application: 送信したアプリを開示する
         setting_system_font_ui: システムのデフォルトフォントを使う
         setting_theme: サイトテーマ

db/migrate/20230215074423_move_user_settings.rb

@@ -9,6 +9,9 @@ class MoveUserSettings < ActiveRecord::Migration[6.1]
     default_sensitive: 'web.default_sensitive',
     default_language: 'default_language',
     public_post_to_unlisted: 'public_post_to_unlisted',
+    reject_public_unlisted_subscription: 'reject_public_unlisted_subscription',
+    reject_unlisted_subscription: 'reject_unlisted_subscription',
+    send_without_domain_blocks: 'send_without_domain_blocks',
     noindex: 'noindex',
     theme: 'theme',
     trends: 'web.trends',

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

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