Fix privacy for misskey

app/lib/activitypub/tag_manager.rb

@@ -130,14 +130,13 @@ class ActivityPub::TagManager
   end
 
   def cc_for_misskey(status)
-    case status.visibility
+    if (status.account.user&.reject_unlisted_subscription? && status.visibility == 'unlisted') || (status.account.user&.reject_public_unlisted_subscription? && status.visibility == 'public_unlisted')
-    when 'unlisted'
+      cc = cc_private_visibility(status)
-      status.account.user&.reject_unlisted_subscription? ? cc_private_visibility(status) : cc(status)
+      cc << uri_for(status.reblog.account) if status.reblog?
-    when 'public_unlisted'
+      return cc
-      status.account.user&.reject_public_unlisted_subscription? ? cc_private_visibility(status) : cc(status)
-    else
-      cc(status)
     end
+
+    cc(status)
   end
 
   def cc_private_visibility(status)

app/policies/status_policy.rb

@@ -122,6 +122,7 @@ class StatusPolicy < ApplicationPolicy
       else
         (@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)
+      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/workers/activitypub/distribution_worker.rb

@@ -31,13 +31,17 @@ class ActivityPub::DistributionWorker < ActivityPub::RawDistributionWorker
   end
 
   def payload_for_misskey
-    @payload ||= Oj.dump(serialize_payload(activity, ActivityPub::ActivityForMisskeySerializer, signer: @account))
+    @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,16 +23,16 @@ class ActivityPub::RawDistributionWorker
   protected
 
   def distribute!
-    return if inboxes.empty? && inboxes_for_misskey.empty?
+    unless inboxes.empty?
-
+      ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url|
-    ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url|
+        [payload, source_account_id, inbox_url, options]
-      [payload, source_account_id, inbox_url, options]
+      end
     end
 
-    return if inboxes_for_misskey.empty?
+    unless inboxes_for_misskey.empty?
-
+      ActivityPub::DeliveryWorker.push_bulk(inboxes_for_misskey) do |inbox_url|
-    ActivityPub::DeliveryWorker.push_bulk(inboxes_for_misskey) do |inbox_url|
+        [payload_for_misskey, source_account_id, inbox_url, options]
-      [payload_for_misskey, source_account_id, inbox_url, options]
+      end
     end
   end