diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-12 18:25:29 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-12 18:25:29 +0400 |
| commit | 697cf920249b4f67bcc49aa923374d5fdc20809b (patch) | |
| tree | ee8630240ae99d32279c6a66aea0a51e2b3f406c /lib/pleroma/web/common_api/activity_draft.ex | |
| parent | 2419776e192316cefbdbe607306c9b92ec558319 (diff) | |
| parent | e557265a037caa0fd4ab35c811d19ad07a5f53fa (diff) | |
| download | pleroma-697cf920249b4f67bcc49aa923374d5fdc20809b.tar.gz | |
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
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) |