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

* 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 0032f13e6238e4da98a10e81e041a9d7460d5370..e6674be8ae0d8a51a6895ae1c4420cf2768ced98 100644 (file)
--- 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)