From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Sun, 15 May 2022 23:00:09 +0000 (+0900)
Subject: Fix `Mastodon::RaceConditionError` that occurs when external status is reblogged... 
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=fc103c42a2049fd699701f36ffeb2d44b692fb9d;p=mastodon.git

Fix `Mastodon::RaceConditionError` that occurs when external status is reblogged (#18424)

* Fix `Mastodon::RaceConditionError` that occurs when external status is reblogged

* Replace to `@object`
---

diff --git a/app/lib/activitypub/activity/announce.rb b/app/lib/activitypub/activity/announce.rb
index 0032f13e6..e6674be8a 100644
--- a/app/lib/activitypub/activity/announce.rb
+++ b/app/lib/activitypub/activity/announce.rb
@@ -4,7 +4,7 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity
   def perform
     return reject_payload! if delete_arrived_first?(@json['id']) || !related_to_local_activity?
 
-    with_lock("announce:#{@object['id']}") do
+    with_lock("announce:#{value_or_id(@object)}") do
       original_status = status_from_object
 
       return reject_payload! if original_status.nil? || !announceable?(original_status)