Merge branch 'bugfix/announce-race-condition' into 'develop'

Announcements: Prevent race condition.

See merge request pleroma/pleroma!2423
This commit is contained in:
rinpatch 2020-04-24 16:58:24 +00:00
commit 8addbd948c
2 changed files with 28 additions and 0 deletions

View file

@ -438,6 +438,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
defp do_announce(user, object, activity_id, local, public) do
with true <- is_announceable?(object, user, public),
object <- Object.get_by_id(object.id),
announce_data <- make_announce_data(user, object, activity_id, public),
{:ok, activity} <- insert(announce_data, local),
{:ok, object} <- add_announce_to_object(activity, object),