diff options
author | Roman Chvanikov <chvanikoff@pm.me> | 2020-04-23 23:51:38 +0300 |
---|---|---|
committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-04-23 23:51:38 +0300 |
commit | 3badbffa0aa04c95ad566ad64f9069ff6dc8f307 (patch) | |
tree | ba702916fcae47958118ea30bab1de87b2dd7e8c /lib/pleroma/web/mastodon_api/controllers/status_controller.ex | |
parent | 416a37fcefbd38d01a46b15e6af039b99a22ee0b (diff) | |
parent | 1b5f8d19eeccfe202c0377079caa6a1d6f3cacb5 (diff) | |
download | pleroma-3badbffa0aa04c95ad566ad64f9069ff6dc8f307.tar.gz |
Merge branch 'develop' into refactor/fe-bundles
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 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)}, |