diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-04-23 11:22:30 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-04-23 11:22:30 +0000 |
| commit | 25eec6d72dae6e771b777aa6460acd600a17fe7d (patch) | |
| tree | 11757ad17a018778f09660a59f7613264c25e917 /lib | |
| parent | 850377a7b8d380088d8717d82b09a2976bbdd739 (diff) | |
| parent | c10485db163d56acd7206980f91f0e51153ef36a (diff) | |
| download | pleroma-25eec6d72dae6e771b777aa6460acd600a17fe7d.tar.gz | |
Merge branch 'bugfix/null-scheduled-at' into 'develop'
StatusController: Ignore nil scheduled_at parameters.
Closes #1699
See merge request pleroma/pleroma!2412
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/status_controller.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex index 397dd10e3..f6e4f7d66 100644 --- a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex @@ -127,7 +127,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusController do def create( %{assigns: %{user: user}} = conn, %{"status" => _, "scheduled_at" => scheduled_at} = params - ) do + ) + when not is_nil(scheduled_at) do params = Map.put(params, "in_reply_to_status_id", params["in_reply_to_id"]) with {:far_enough, true} <- {:far_enough, ScheduledActivity.far_enough?(scheduled_at)}, |