Change delivering to misskey setting to send as private

app/lib/activitypub/tag_manager.rb

@@ -124,6 +124,25 @@ class ActivityPub::TagManager
       cc << COLLECTIONS[:public]
     end
 
+    cc = cc + cc_private_visibility(status)
+
+    cc
+  end
+
+  def cc_for_misskey(status)
+    case status.visibility
+    when 'unlisted'
+      status.account.user&.reject_unlisted_subscription? ? cc_private_visibility(status) : cc(status)
+    when 'public_unlisted'
+      status.account.user&.reject_public_unlisted_subscription? ? cc_private_visibility(status) : cc(status)
+    else
+      cc(status)
+    end
+  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)
@@ -98,8 +120,8 @@ class StatusReachFinder
     return @banned_domains if @banned_domains
 
     domains = banned_domains_of_status(@status)
-    domains = domains + banned_domains_of_status(@status.reblog) if @status.reblog? && @status.reblog.status.local?
-    return @banned_domains = domains
+    domains = domains + banned_domains_of_status(@status.reblog) if @status.reblog? && @status.reblog.local?
+    return @banned_domains = domains.uniq
   end
 
   def banned_domains_of_status(status)
@@ -107,10 +129,25 @@ class StatusReachFinder
     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(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(detect_invalid_subscription: true)) if status.public_unlisted_visibility? && status.account.user&.reject_public_unlisted_subscription?
+    blocks = blocks.or(DomainBlock.where(detect_invalid_subscription: true)) if status.unlisted_visibility? && status.account.user&.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
   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&.reject_public_unlisted_subscription?
+    blocks = blocks.or(DomainBlock.where(detect_invalid_subscription: true)) if status.unlisted_visibility? && status.account.user&.reject_unlisted_subscription?
+    blocks.pluck(:domain).uniq
+  end
 end

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

app/models/user.rb

@@ -320,6 +320,14 @@ class User < ApplicationRecord
     settings.default_searchability || 'public'
   end
 
+  def reject_public_unlisted_subscription?
+    settings.reject_public_unlisted_subscription
+  end
+
+  def reject_unlisted_subscription?
+    settings.reject_unlisted_subscription
+  end
+
   def allows_report_emails?
     settings.notification_emails['report']
   end

app/policies/status_policy.rb

@@ -114,8 +114,8 @@ class StatusPolicy < ApplicationPolicy
       (@domain_block.reject_send_not_public_searchability && status.compute_searchability != 'public') ||
       (@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.detect_invalid_subscription && status.public_unlisted_visibility? && status.account.user&.reject_public_unlisted_subscription) ||
+      (@domain_block.detect_invalid_subscription && status.public_visibility? && status.account.user&.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

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/workers/activitypub/distribution_worker.rb

@@ -15,13 +15,25 @@ 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 ||= Oj.dump(serialize_payload(activity, ActivityPub::ActivityForMisskeySerializer, signer: @account))
+  end
+
   def activity
     ActivityPub::ActivityPresenter.from_status(@status)
   end

app/workers/activitypub/raw_distribution_worker.rb

@@ -23,17 +23,27 @@ class ActivityPub::RawDistributionWorker
   protected
 
   def distribute!
-    return if inboxes.empty?
+    return if inboxes.empty? && inboxes_for_misskey.empty?
 
     ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url|
       [payload, source_account_id, inbox_url, options]
     end
+
+    return if inboxes_for_misskey.empty?
+
+    ActivityPub::DeliveryWorker.push_bulk(inboxes_for_misskey) do |inbox_url|
+      [payload_for_misskey, source_account_id, inbox_url, options]
+    end
   end
 
   def payload
     @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/simple_form.ja.yml

@@ -62,7 +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_reject_unlisted_subscription: Misskeyやそのフォーク(Calckeyなど)は、フォローしていないアカウントの「未収載」投稿を **購読・検索** することができます。これはMastodonにおける「未収載」投稿の基本的な考え方、扱い方と矛盾します。そのようなサーバーのうち管理人が指定したものに、指定した公開範囲の投稿を「フォロワーのみ」として配送します。ただし構造上、完璧な対応は困難でたまに未収載として配信されること、ご理解ください
         setting_show_application: 投稿するのに使用したアプリが投稿の詳細ビューに表示されるようになります
         setting_use_blurhash: ぼかしはメディアの色を元に生成されますが、細部は見えにくくなっています
         setting_use_pending_items: 新着があってもタイムラインを自動的にスクロールしないようにします