gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 17

Fix privacy for misskey

Browse source
This commit is contained in:
KMY 2023-05-01 13:26:10 +09:00
parent d031ade823
commit 7bcef0f8b2
5 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/lib/activitypub/tag_manager.rb
View file

@ -130,14 +130,13 @@ class ActivityPub::TagManager
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)
if (status.account.user&.reject_unlisted_subscription? && status.visibility == 'unlisted') || (status.account.user&.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)

1
app/policies/status_policy.rb
View file

@ -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

4
app/presenters/activitypub/activity_presenter.rb
View file

@ -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?

6
app/workers/activitypub/distribution_worker.rb
View file

@ -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

16
app/workers/activitypub/raw_distribution_worker.rb
View file

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