Add: #8 サークル投稿の転送 (#294)

* 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:
KMY(雪あすか) 2023-11-30 09:29:24 +09:00 committed by GitHub
parent a52a8ce214
commit a88349af55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 1115 additions and 77 deletions

View file

@ -93,6 +93,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
resolve_thread(@status)
fetch_replies(@status)
process_conversation! if @status.limited_visibility?
process_references!
distribute
forward_for_reply
@ -132,7 +133,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
limited_scope: @status_parser.limited_scope,
searchability: @status_parser.searchability,
thread: replied_to_status,
conversation: conversation_from_uri(@object['conversation']),
conversation: conversation_from_activity,
media_attachment_ids: process_attachments.take(MediaAttachment::ACTIVITYPUB_STATUS_ATTACHMENT_MAX).map(&:id),
poll: process_poll,
}
@ -184,6 +185,10 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
@silenced_account_ids = @mentions.map(&:account_id) - accounts_in_audience.map(&:id)
end
def account_representative
accounts_in_audience.detect(&:local?) || Account.representative
end
def postprocess_audience_and_deliver
return if @status.mentions.find_by(account_id: @options[:delivered_to_account_id])
@ -373,6 +378,10 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
ActivityPub::FetchRepliesWorker.perform_async(status.id, uri, { 'request_id' => @options[:request_id] }) unless uri.nil?
end
def conversation_from_activity
conversation_from_context(@object['context']) || conversation_from_uri(@object['conversation'])
end
def conversation_from_uri(uri)
return nil if uri.nil?
return Conversation.find_by(id: OStatus::TagManager.instance.unique_tag_to_local_id(uri, 'Conversation')) if OStatus::TagManager.instance.local_id?(uri)
@ -384,6 +393,26 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
end
end
def conversation_from_context(uri)
return nil if uri.nil?
return Conversation.find_by(id: ActivityPub::TagManager.instance.uri_to_local_id(uri)) if ActivityPub::TagManager.instance.local_uri?(uri)
begin
conversation = Conversation.find_or_create_by!(uri: uri)
json = fetch_resource_without_id_validation(uri, account_representative)
return conversation if json.nil? || json['type'] != 'Group'
return conversation if json['inbox'].blank? || json['inbox'] == conversation.inbox_url
conversation.update!(inbox_url: json['inbox'])
conversation
rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
retry
rescue Mastodon::UnexpectedResponseError
Conversation.find_or_create_by!(uri: uri)
end
end
def replied_to_status
return @replied_to_status if defined?(@replied_to_status)
@ -483,6 +512,16 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
ActivityPub::RawDistributionWorker.perform_async(Oj.dump(@json), replied_to_status.account_id, [@account.preferred_inbox_url])
end
def process_conversation!
return unless @status.conversation.present? && @status.conversation.local?
ProcessConversationService.new.call(@status)
return if @json['signature'].blank?
ActivityPub::ForwardConversationWorker.perform_async(Oj.dump(@json), @status.id, false)
end
def increment_voters_count!
poll = replied_to_status.preloadable_poll

View file

@ -40,10 +40,17 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
return if @status.nil?
forwarder.forward! if forwarder.forwardable?
forward_for_conversation
delete_now!
end
end
def forward_for_conversation
return unless @status.conversation.present? && @status.conversation.local? && @json['signature'].present?
ActivityPub::ForwardConversationWorker.perform_async(Oj.dump(@json), @status.id, true)
end
def delete_friend
friend = FriendDomain.find_by(domain: @account.domain)
friend&.destroy

View file

@ -31,5 +31,13 @@ class ActivityPub::Activity::Update < ActivityPub::Activity
return if @status.nil?
ActivityPub::ProcessStatusUpdateService.new.call(@status, @json, @object, request_id: @options[:request_id])
forward_for_conversation
end
def forward_for_conversation
return unless @status.conversation.present? && @status.conversation.local? && @json['signature'].present?
ActivityPub::ForwardConversationWorker.perform_async(Oj.dump(@json), @status.id, true)
end
end

View file

@ -105,6 +105,8 @@ class ActivityPub::Parser::StatusParser
:mutual
when 'Circle'
:circle
when 'Reply'
:reply
else
:none
end

View file

@ -49,6 +49,8 @@ class ActivityPub::TagManager
emoji_url(target)
when :emoji_reaction
emoji_reaction_url(target)
when :conversation
context_url(target)
when :flag
target.uri
end
@ -119,7 +121,8 @@ class ActivityPub::TagManager
end.compact
end
when 'limited'
['kmyblue:Limited'] # to avoid Fedibird personal visibility
# do not empty array to avoid Fedibird personal visibility
status.conversation.nil? ? ['kmyblue:Limited'] : [context_url(status.conversation)]
end
end
@ -225,10 +228,15 @@ class ActivityPub::TagManager
end
def limited_scope(status)
if status.mutual_limited?
case status.limited_scope
when 'mutual'
'Mutual'
when 'circle'
'Circle'
when 'reply'
'Reply'
else
status.circle_limited? ? 'Circle' : ''
''
end
end
@ -250,8 +258,6 @@ class ActivityPub::TagManager
[COLLECTIONS[:public]]
when 'private'
[account_followers_url(status.account)]
when 'direct'
status.conversation_id.present? ? [uri_for(status.conversation)] : []
when 'limited'
['as:Limited', 'kmyblue:Limited']
else
@ -271,7 +277,7 @@ class ActivityPub::TagManager
case account.compute_searchability_activitypub
when 'public'
[COLLECTIONS[:public]]
when 'private', 'direct'
when 'private'
[account_followers_url(account)]
when 'limited'
['as:Limited', 'kmyblue:Limited']