Cycles: refactor Pleroma.User, Pleroma.User.Registration

Breaks cycles involving UserEmail

2 files changed, 8 insertions, 7 deletions

diff --git a/lib/mix/tasks/pleroma/email.ex b/lib/mix/tasks/pleroma/email.ex
index 4ce8c9b05..7a05d7b93 100644
--- a/lib/mix/tasks/pleroma/email.ex
+++ b/lib/mix/tasks/pleroma/email.ex
@@ -38,7 +38,7 @@ defmodule Mix.Tasks.Pleroma.Email do
       invisible: false
     })
     |> Pleroma.Repo.chunk_stream(500)
-    |> Stream.each(&Pleroma.User.maybe_send_confirmation_email(&1))
+    |> Stream.each(&Pleroma.User.Registration.maybe_send_confirmation_email(&1))
     |> Stream.run()
   end
 end
diff --git a/lib/mix/tasks/pleroma/user.ex b/lib/mix/tasks/pleroma/user.ex
index 53d5fc6d9..1e75a39ca 100644
--- a/lib/mix/tasks/pleroma/user.ex
+++ b/lib/mix/tasks/pleroma/user.ex
@@ -7,6 +7,7 @@ defmodule Mix.Tasks.Pleroma.User do
   import Mix.Pleroma
   alias Ecto.Changeset
   alias Pleroma.User
+  alias Pleroma.User.Registration
   alias Pleroma.UserInviteToken
   alias Pleroma.Web.ActivityPub.Builder
   alias Pleroma.Web.ActivityPub.Pipeline
@@ -74,8 +75,8 @@ defmodule Mix.Tasks.Pleroma.User do
         bio: bio
       }
 
-      changeset = User.register_changeset(%User{}, params, is_confirmed: true)
-      {:ok, _user} = User.register(changeset)
+      changeset = Registration.register_changeset(%User{}, params, is_confirmed: true)
+      {:ok, _user} = Registration.register(changeset)
 
       shell_info("User #{nickname} created")
 
@@ -355,7 +356,7 @@ defmodule Mix.Tasks.Pleroma.User do
     start_pleroma()
 
     with %User{} = user <- User.get_cached_by_nickname(nickname) do
-      {:ok, user} = User.confirm(user)
+      {:ok, user} = Registration.confirm(user)
 
       message = if !user.is_confirmed, do: "needs", else: "doesn't need"
 
@@ -379,7 +380,7 @@ defmodule Mix.Tasks.Pleroma.User do
     |> Pleroma.Repo.chunk_stream(500, :batches)
     |> Stream.each(fn users ->
       users
-      |> Enum.each(fn user -> User.set_confirmation(user, true) end)
+      |> Enum.each(fn user -> Registration.set_confirmation(user, true) end)
     end)
     |> Stream.run()
   end
@@ -397,7 +398,7 @@ defmodule Mix.Tasks.Pleroma.User do
     |> Pleroma.Repo.chunk_stream(500, :batches)
     |> Stream.each(fn users ->
       users
-      |> Enum.each(fn user -> User.set_confirmation(user, false) end)
+      |> Enum.each(fn user -> Registration.set_confirmation(user, false) end)
     end)
     |> Stream.run()
   end
@@ -461,7 +462,7 @@ defmodule Mix.Tasks.Pleroma.User do
   end
 
   defp set_confirmation(user, value) do
-    {:ok, user} = User.set_confirmation(user, value)
+    {:ok, user} = Registration.set_confirmation(user, value)
 
     shell_info("Confirmation status of #{user.nickname}: #{user.is_confirmed}")
     user