projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix-auto-link-for-profile-fields' into 'develop'
[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..e1e6bd89b9185b4d19d90bff7e59bd52bf8d685f 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/controllers/scheduled_activity_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/controllers/scheduled_activity_controller.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.ScheduledActivityController do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.ScheduledActivityController do
@@
-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
@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
render(conn, "show.json", scheduled_activity: scheduled_activity)
end
end