mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-22 00:58:18 +00:00
Fix Mastodon::RaceConditionError
that occurs when external status is reblogged (#18424)
* Fix `Mastodon::RaceConditionError` that occurs when external status is reblogged * Replace to `@object`
This commit is contained in:
parent
95a036c598
commit
c3fac61f56
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue