diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-04-24 16:58:24 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-04-24 16:58:24 +0000 |
| commit | 8addbd948ca08ce92780bf7afdff95286bf719fa (patch) | |
| tree | d100a92eda58b8680a2b74eb4368f88f8f262d66 /lib | |
| parent | c30b3b2dc5c6da037ae72b6cb537898a78cd53bc (diff) | |
| parent | cb12585098e0cc1e2e85d253812e1898e8034b7f (diff) | |
| download | pleroma-8addbd948ca08ce92780bf7afdff95286bf719fa.tar.gz pleroma-8addbd948ca08ce92780bf7afdff95286bf719fa.zip | |
Merge branch 'bugfix/announce-race-condition' into 'develop'
Announcements: Prevent race condition.
See merge request pleroma/pleroma!2423
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 9ec31fb03..61a4960a0 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -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), |