hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix ScheduledActivity

Browse source
This commit is contained in:
Maksim Pechnikov 2019-12-04 21:18:05 +03:00
commit 3c3bba0b7c
3 changed files with 51 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/pleroma/scheduled_activity.ex
View file

@ -119,11 +119,7 @@ defmodule Pleroma.ScheduledActivity do
def create(%User{} = user, attrs) do
Multi.new()
|> Multi.insert(:scheduled_activity, new(user, attrs))
|> Multi.run(:scheduled_activity_job, fn _repo, %{scheduled_activity: activity} ->
%{activity_id: activity.id}
|> ScheduledActivityWorker.new(scheduled_at: activity.scheduled_at)
|> Oban.insert()
end)
|> maybe_add_jobs(Config.get([ScheduledActivity, :enabled]))
|> Repo.transaction()
|> case do
{:ok, %{scheduled_activity: scheduled_activity}} ->
@ -134,6 +130,17 @@ defmodule Pleroma.ScheduledActivity do
end
end
defp maybe_add_jobs(multi, true) do
multi
|> Multi.run(:scheduled_activity_job, fn _repo, %{scheduled_activity: activity} ->
%{activity_id: activity.id}
|> ScheduledActivityWorker.new(scheduled_at: activity.scheduled_at)
|> Oban.insert()
end)
end
defp maybe_add_jobs(multi, _), do: multi
def get(%User{} = user, scheduled_activity_id) do
ScheduledActivity
|> where(user_id: ^user.id)