Merge branch 'patch-2' into 'develop'

[akkoma] / lib / pleroma / web / twitter_api / twitter_api.ex

diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index 402fd195f8af204ca5591eced1675a4395297f90..d6ce0a7c609878833fb039c29a094aa40f1b7fe4 100644 (file)
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -4,10 +4,10 @@
 
 defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
   alias Pleroma.Activity
-  alias Pleroma.Mailer
+  alias Pleroma.Emails.Mailer
+  alias Pleroma.Emails.UserEmail
   alias Pleroma.Repo
   alias Pleroma.User
-  alias Pleroma.UserEmail
   alias Pleroma.UserInviteToken
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.CommonAPI
@@ -167,10 +167,6 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
     end
   end
 
-  defp registration_process(_registration_open = true, params, _token) do
-    create_user(params)
-  end
-
   defp registration_process(registration_open, params, token)
        when registration_open == false or is_nil(registration_open) do
     invite =
@@ -193,6 +189,10 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
     end
   end
 
+  defp registration_process(true, params, _token) do
+    create_user(params)
+  end
+
   defp create_user(params) do
     changeset = User.register_changeset(%User{}, params)