X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fuser.ex;h=03be61ccf947b9e8fb2a391ef00d6be6f792e531;hb=f3a1f9c3bbb7321876a09b3846b5e10ecf4af94f;hp=410c9cbac1a67cd78fd0c13a6098c66e16262d4e;hpb=ed3bc53fa137ec4652606cad1df5783c47afb830;p=akkoma

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 410c9cbac..03be61ccf 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -813,7 +813,8 @@ defmodule Pleroma.User do
   def send_welcome_email(_), do: {:ok, :noop}
 
   @spec try_send_confirmation_email(User.t()) :: {:ok, :enqueued | :noop}
-  def try_send_confirmation_email(%User{confirmation_pending: true} = user) do
+  def try_send_confirmation_email(%User{confirmation_pending: true, email: email} = user)
+      when is_binary(email) do
     if Config.get([:instance, :account_activation_required]) do
       send_confirmation_email(user)
       {:ok, :enqueued}
@@ -2071,6 +2072,13 @@ defmodule Pleroma.User do
     Enum.map(users, &toggle_confirmation/1)
   end
 
+  @spec need_confirmation(User.t(), boolean()) :: {:ok, User.t()} | {:error, Changeset.t()}
+  def need_confirmation(%User{} = user, bool) do
+    user
+    |> confirmation_changeset(need_confirmation: bool)
+    |> update_and_set_cache()
+  end
+
   def get_mascot(%{mascot: %{} = mascot}) when not is_nil(mascot) do
     mascot
   end