Merge remote-tracking branch 'parent/main' into upstream-20240705

2024-07-05 07:22:34 +09:00 · 2024-07-05 07:22:34 +09:00 · 9a07550fa6
commit 9a07550fa6
parent 8b2effcf16 df9e26158d
75 changed files with 1046 additions and 543 deletions
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@ -118,7 +118,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
  def find_existing_status
    status   = status_from_uri(object_uri)
    status ||= Status.find_by(uri: @object['atomUri']) if @object['atomUri'].present?
-    status
+    status if status&.account_id == @account.id
  end

  def process_status_params