Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope

2020-11-04 11:47:41 +01:00 · 2020-11-04 11:47:41 +01:00 · c7bcbfbc1d
commit c7bcbfbc1d
parent 1cc8e94506 ba3f3a5a56
50 changed files with 1118 additions and 32 deletions
--- a/lib/pleroma/web/common_api.ex
+++ b/lib/pleroma/web/common_api.ex
@ -46,7 +46,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