Merge branch 'from/upstream-develop/tusooa/register-approval' into 'develop'

Fix failure when registering a user with no email when approval required

Closes #3021

See merge request pleroma/pleroma!3807

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index b422e5c1d..d2ae08888 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -905,7 +905,7 @@ defmodule Pleroma.User do
     end
   end
 
-  defp send_user_approval_email(user) do
+  defp send_user_approval_email(%User{email: email} = user) when is_binary(email) do
     user
     |> Pleroma.Emails.UserEmail.approval_pending_email()
     |> Pleroma.Emails.Mailer.deliver_async()
@@ -913,6 +913,10 @@ defmodule Pleroma.User do
     {:ok, :enqueued}
   end
 
+  defp send_user_approval_email(_user) do
+    {:ok, :skipped}
+  end
+
   defp send_admin_approval_emails(user) do
     all_superusers()
     |> Enum.filter(fn user -> not is_nil(user.email) end)