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

* Fix `Mastodon::RaceConditionError` that occurs when external status is reblogged * Replace to `@object`
2022-05-16 08:00:09 +09:00 · 2022-05-16 08:00:09 +09:00 · c3fac61f56
parent 95a036c598
commit c3fac61f56
1 changed files with 1 additions and 1 deletions
--- 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)