diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2020-06-14 22:36:52 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-06-14 22:36:52 +0300 |
| commit | e1dc36afe0fc2ab96e23c1b0c2fa78465d2f9e0f (patch) | |
| tree | 8c29db2e9bb128f9316c62892a533be114e238b4 /lib/pleroma/web/common_api/activity_draft.ex | |
| parent | 0ab69da1f25d93b0f2e1827ad044b2f1bf6a1cf2 (diff) | |
| parent | 271ea5068f4e3b901cb3f682e132378246daf452 (diff) | |
| download | pleroma-e1dc36afe0fc2ab96e23c1b0c2fa78465d2f9e0f.tar.gz | |
Merge branch 'develop' into refactor/fe-bundles
Diffstat (limited to 'lib/pleroma/web/common_api/activity_draft.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/activity_draft.ex | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api/activity_draft.ex b/lib/pleroma/web/common_api/activity_draft.ex index 3f1a50b96..9bcb9f587 100644 --- a/lib/pleroma/web/common_api/activity_draft.ex +++ b/lib/pleroma/web/common_api/activity_draft.ex @@ -197,6 +197,13 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do defp changes(draft) do direct? = draft.visibility == "direct" + additional = %{"cc" => draft.cc, "directMessage" => direct?} + + additional = + case draft.expires_at do + %NaiveDateTime{} = expires_at -> Map.put(additional, "expires_at", expires_at) + _ -> additional + end changes = %{ @@ -204,7 +211,7 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do actor: draft.user, context: draft.context, object: draft.object, - additional: %{"cc" => draft.cc, "directMessage" => direct?} + additional: additional } |> Utils.maybe_add_list_data(draft.user, draft.visibility) |