tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ActivityPub::Activity::Create trying to re-create known statuses when author changes (#39916)

Browse Source
This commit is contained in:
Claire 2026-07-22 16:29:39 +02:00 committed by Tarrien
parent c3d24dbe96
commit 15cca7599a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/lib/activitypub/activity/create.rb
View File

@ -36,6 +36,9 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
if @status.nil? if @status.nil?
process_status process_status
elsif @status.account_id != @account.id
Rails.logger.debug { "Not processing #{object_uri}: authorship change is not supported" }
return reject_payload!
elsif @options[:delivered_to_account_id].present? elsif @options[:delivered_to_account_id].present?
postprocess_audience_and_deliver postprocess_audience_and_deliver
end end
@ -91,7 +94,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
def find_existing_status def find_existing_status
status = status_from_uri(object_uri) status = status_from_uri(object_uri)
status ||= Status.find_by(uri: @object['atomUri']) if @object['atomUri'].present? status ||= Status.find_by(uri: @object['atomUri']) if @object['atomUri'].present?
status if status&.account_id == @account.id status
end end
def process_status_params def process_status_params