diff options
author | lain <lain@soykaf.club> | 2020-11-04 16:18:11 +0100 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-11-04 16:18:11 +0100 |
commit | bae48c98e32af6c43fa668771c6253f299d4bf8a (patch) | |
tree | 0ceb2b31a2c65af23039e4074c51c495dd7dd8f8 /lib/pleroma/web/common_api.ex | |
parent | 04b7505c75afbaa1f785b2adaf0313e9b0935fab (diff) | |
parent | 4800ee656bbcd8fe21fe56531123d3a18eccc911 (diff) | |
download | pleroma-bae48c98e32af6c43fa668771c6253f299d4bf8a.tar.gz |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior
Diffstat (limited to 'lib/pleroma/web/common_api.ex')
-rw-r--r-- | lib/pleroma/web/common_api.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api.ex b/lib/pleroma/web/common_api.ex index 60a50b027..318ffc5d0 100644 --- a/lib/pleroma/web/common_api.ex +++ b/lib/pleroma/web/common_api.ex @@ -45,7 +45,8 @@ defmodule Pleroma.Web.CommonAPI do {_, {:ok, %Activity{} = activity, _meta}} <- {:common_pipeline, Pipeline.common_pipeline(create_activity_data, - local: true + local: true, + idempotency_key: opts[:idempotency_key] )} do {:ok, activity} else |