* Add: `conversations`テーブルに`ancestor_status`プロパティ * Fix test * Fix test more * Add: `limited_visibility`に`Reply`を追加、`context`のURI * Add: 外部からの`context`受信処理 * Fix test * Add: 公開範囲「返信」 * Fix test * Fix: 返信に返信以外の公開範囲を設定できない問題 * Add: ローカル投稿時にメンション追加・他サーバーへの転送 * Fix test * Fix test * Test: ローカルスレッドへの返信投稿の転送 * Test: 未知のアカウントからのメンション * Add: 編集・削除の連合に対応 * Remove: 重複テスト * Fix: 改善 * Add: 編集削除の転送処理・返信なのにsilentなメンションでの通知 * Fix: リプライが第三者に届かない問題 * Add: `always_sign_unsafe` * Add: Subject * Remove space * Fix: 他人のスレッドの送信先一覧を非表示 * Fix: おかしいコード
This commit is contained in:
parent
a52a8ce214
commit
a88349af55
42 changed files with 1115 additions and 77 deletions
|
@ -19,11 +19,26 @@ class ActivityPub::DistributionWorker < ActivityPub::RawDistributionWorker
|
|||
protected
|
||||
|
||||
def distribute_limited!
|
||||
if @status.reply? && @status.conversation.present? && !@status.conversation.local?
|
||||
distribute_conversation!
|
||||
else
|
||||
distribute_limited_mentions!
|
||||
end
|
||||
end
|
||||
|
||||
def distribute_limited_mentions!
|
||||
ActivityPub::DeliveryWorker.push_bulk(inboxes_for_limited, limit: 1_000) do |inbox_url|
|
||||
[payload, @account.id, inbox_url, options]
|
||||
end
|
||||
end
|
||||
|
||||
def distribute_conversation!
|
||||
inbox_url = @status.conversation.inbox_url
|
||||
return if inbox_url.blank?
|
||||
|
||||
ActivityPub::DeliveryWorker.perform_async(payload, @account.id, inbox_url, options)
|
||||
end
|
||||
|
||||
def inboxes
|
||||
@inboxes ||= status_reach_finder.inboxes
|
||||
end
|
||||
|
@ -45,7 +60,7 @@ class ActivityPub::DistributionWorker < ActivityPub::RawDistributionWorker
|
|||
end
|
||||
|
||||
def payload
|
||||
@payload ||= Oj.dump(serialize_payload(activity, ActivityPub::ActivitySerializer, signer: @account))
|
||||
@payload ||= Oj.dump(serialize_payload(activity, ActivityPub::ActivitySerializer, signer: @account, always_sign_unsafe: always_sign))
|
||||
end
|
||||
|
||||
def payload_for_misskey
|
||||
|
@ -53,7 +68,7 @@ class ActivityPub::DistributionWorker < ActivityPub::RawDistributionWorker
|
|||
end
|
||||
|
||||
def payload_for_friend
|
||||
@payload_for_friend ||= Oj.dump(serialize_payload(activity_for_friend, ActivityPub::ActivityForFriendSerializer, signer: @account))
|
||||
@payload_for_friend ||= Oj.dump(serialize_payload(activity_for_friend, ActivityPub::ActivityForFriendSerializer, signer: @account, always_sign_unsafe: always_sign))
|
||||
end
|
||||
|
||||
def activity
|
||||
|
@ -68,6 +83,10 @@ class ActivityPub::DistributionWorker < ActivityPub::RawDistributionWorker
|
|||
ActivityPub::ActivityPresenter.from_status(@status, for_friend: true)
|
||||
end
|
||||
|
||||
def always_sign
|
||||
false
|
||||
end
|
||||
|
||||
def options
|
||||
{ 'synchronize_followers' => @status.private_visibility? }
|
||||
end
|
||||
|
|
46
app/workers/activitypub/forward_conversation_worker.rb
Normal file
46
app/workers/activitypub/forward_conversation_worker.rb
Normal file
|
@ -0,0 +1,46 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class ActivityPub::ForwardConversationWorker
|
||||
include Sidekiq::Worker
|
||||
|
||||
def perform(payload, status_id, shared_inbox)
|
||||
@status = Status.find(status_id)
|
||||
@payload = payload
|
||||
@shared_inbox = shared_inbox
|
||||
|
||||
return unless @status.conversation.present? && @status.conversation.local? && @status.conversation.ancestor_status.present?
|
||||
return unless @status.limited_visibility?
|
||||
|
||||
@account = @status.conversation.ancestor_status.account
|
||||
|
||||
distribute_limited_mentions!
|
||||
rescue ActiveRecord::RecordNotFound
|
||||
true
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def distribute_limited_mentions!
|
||||
ActivityPub::DeliveryWorker.push_bulk(inboxes_for_limited, limit: 1_000) do |inbox_url|
|
||||
[payload, @account.id, inbox_url, options]
|
||||
end
|
||||
end
|
||||
|
||||
def inboxes_for_limited
|
||||
if @shared_inbox
|
||||
inbox_accounts.inboxes
|
||||
else
|
||||
DeliveryFailureTracker.without_unavailable(inbox_accounts.pluck(:inbox_url).compact_blank.uniq)
|
||||
end
|
||||
end
|
||||
|
||||
def inbox_accounts
|
||||
Account.remote.merge(@status.mentioned_accounts)
|
||||
end
|
||||
|
||||
def options
|
||||
{ 'synchronize_followers' => @status.private_visibility? }
|
||||
end
|
||||
|
||||
attr_reader :payload
|
||||
end
|
|
@ -8,13 +8,21 @@ class ActivityPub::StatusUpdateDistributionWorker < ActivityPub::DistributionWor
|
|||
@status = Status.find(status_id)
|
||||
@account = @status.account
|
||||
|
||||
distribute!
|
||||
if @status.limited_visibility?
|
||||
distribute_limited!
|
||||
else
|
||||
distribute!
|
||||
end
|
||||
rescue ActiveRecord::RecordNotFound
|
||||
true
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def inboxes_for_limited
|
||||
@inboxes_for_limited ||= @status.mentioned_accounts.inboxes
|
||||
end
|
||||
|
||||
def build_activity(for_misskey: false, for_friend: false)
|
||||
ActivityPub::ActivityPresenter.new(
|
||||
id: [ActivityPub::TagManager.instance.uri_for(@status), '#updates/', @status.edited_at.to_i].join,
|
||||
|
@ -38,4 +46,8 @@ class ActivityPub::StatusUpdateDistributionWorker < ActivityPub::DistributionWor
|
|||
def activity_for_friend
|
||||
build_activity(for_friend: true)
|
||||
end
|
||||
|
||||
def always_sign
|
||||
@status.limited_visibility?
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue