Merge remote-tracking branch 'origin/develop' into global-status-expiration

[akkoma] / lib / pleroma / web / mastodon_api / controllers / scheduled_activity_controller.ex

diff --git a/lib/pleroma/web/mastodon_api/controllers/scheduled_activity_controller.ex b/lib/pleroma/web/mastodon_api/controllers/scheduled_activity_controller.ex
index 4f9a8bdbec7237cee3328699909de8b88c721492..ff9276541614f675491ae644e32678aabd63f627 100644 (file)
--- a/lib/pleroma/web/mastodon_api/controllers/scheduled_activity_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/scheduled_activity_controller.ex
@@ -45,8 +45,7 @@ defmodule Pleroma.Web.MastodonAPI.ScheduledActivityController do
 
   @doc "DELETE /api/v1/scheduled_statuses/:id"
   def delete(%{assigns: %{scheduled_activity: scheduled_activity}} = conn, _params) do
-    with {:ok, scheduled_activity} <- ScheduledActivity.delete(scheduled_activity),
-         _ <- ScheduledActivity.delete_job(scheduled_activity) do
+    with {:ok, scheduled_activity} <- ScheduledActivity.delete(scheduled_activity) do
       render(conn, "show.json", scheduled_activity: scheduled_activity)
     end
   end