Merge commit 'a5b4a2b7e7' into kb-draft-5.21-lts

2024-07-05 06:40:30 +09:00 · 2024-07-05 06:40:30 +09:00 · 6896542a76
commit 6896542a76
parent e925fd6802 a5b4a2b7e7
33 changed files with 338 additions and 109 deletions
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@ -116,7 +116,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