Merge remote-tracking branch 'upstream/develop' into develop

[akkoma] / priv / repo / migrations / 20200825061316_move_activity_expirations_to_oban.exs

diff --git a/priv/repo/migrations/20200825061316_move_activity_expirations_to_oban.exs b/priv/repo/migrations/20200825061316_move_activity_expirations_to_oban.exs
index 2bfefceb07192037f7c8d5eeecbfae1b3d76e011..096ab4ce5c7ed58ba837e234fefbf8eae69cb08e 100644 (file)
--- a/priv/repo/migrations/20200825061316_move_activity_expirations_to_oban.exs
+++ b/priv/repo/migrations/20200825061316_move_activity_expirations_to_oban.exs
@@ -4,6 +4,10 @@ defmodule Pleroma.Repo.Migrations.MoveActivityExpirationsToOban do
   import Ecto.Query, only: [from: 2]
 
   def change do
+    Pleroma.Config.Oban.warn()
+
+    Application.ensure_all_started(:oban)
+
     Supervisor.start_link([{Oban, Pleroma.Config.get(Oban)}],
       strategy: :one_for_one,
       name: Pleroma.Supervisor
@@ -13,12 +17,11 @@ defmodule Pleroma.Repo.Migrations.MoveActivityExpirationsToOban do
       select: %{id: e.id, activity_id: e.activity_id, scheduled_at: e.scheduled_at}
     )
     |> Pleroma.Repo.stream()
-    |> Enum.each(fn expiration ->
+    |> Stream.each(fn expiration ->
       with {:ok, expires_at} <- DateTime.from_naive(expiration.scheduled_at, "Etc/UTC") do
         Pleroma.Workers.PurgeExpiredActivity.enqueue(%{
           activity_id: FlakeId.to_string(expiration.activity_id),
-          expires_at: expires_at,
-          validate: false
+          expires_at: expires_at
         })
       end
     end)