diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-06-15 15:24:55 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-06-15 15:24:55 +0300 |
| commit | 579763126f52b21733e84594f36b86e270b3005d (patch) | |
| tree | 2b183b4b4ac4be2a4b64da87adc7ed56b7222f39 /lib/pleroma/web/common_api/activity_draft.ex | |
| parent | efdfc85c2d8e5118c1aa18e4f04026ec90cd11d2 (diff) | |
| parent | 448e93ce2c1eab9eb91118b90f661c31056e4781 (diff) | |
| download | pleroma-579763126f52b21733e84594f36b86e270b3005d.tar.gz | |
Merge branch 'develop' into issue/1855
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) |