Always return {atom, _} from try_send_confirmation
authorSadposter <hannah+pleroma@coffee-and-dreams.uk>
Sun, 14 Apr 2019 15:01:48 +0000 (16:01 +0100)
committerSadposter <hannah+pleroma@coffee-and-dreams.uk>
Sun, 14 Apr 2019 15:01:48 +0000 (16:01 +0100)
lib/pleroma/user.ex

index 3ab7bd7423258a80df708b6f63fc4a34522f34c7..78eb29ddd8839dc73bee3dac5905cb63ebf59030 100644 (file)
@@ -270,7 +270,7 @@ defmodule Pleroma.User do
     with {:ok, user} <- Repo.insert(changeset),
          {:ok, user} <- autofollow_users(user),
          {:ok, _} <- Pleroma.User.WelcomeMessage.post_welcome_message_to_user(user),
-         :ok <- try_send_confirmation_email(user) do
+         {:ok, _} <- try_send_confirmation_email(user) do
       {:ok, user}
     end
   end
@@ -281,6 +281,8 @@ defmodule Pleroma.User do
       user
       |> Pleroma.Emails.UserEmail.account_confirmation_email()
       |> Pleroma.Emails.Mailer.deliver_async()
+
+      {:ok, :enqueued}
     else
       {:ok, :noop}
     end