diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-28 19:56:20 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-28 19:56:20 +0300 |
| commit | 908cf22a6cb07044eb0fb44c9673c8adcf22c0db (patch) | |
| tree | b522172092989cb1d1312f846974ff55493fbee9 /lib/pleroma/web/mastodon_api/controllers/status_controller.ex | |
| parent | b4139cc5472079a34f0256ac9991a0222844d44c (diff) | |
| parent | 699fc9569fa06278baaec6804348375cb9891185 (diff) | |
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/status_controller.ex')
| -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 45601ff59..9eea2e9eb 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)}, |