From: Mark Felder <feld@FreeBSD.org>
Date: Tue, 8 Sep 2020 21:48:54 +0000 (-0500)
Subject: Handle possibility of user account in a bulk operation not having an email address
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=d23d0c27c25e3ce7b39cae6e504062b4cb389ea4;p=akkoma

Handle possibility of user account in a bulk operation not having an email address
---

diff --git a/lib/mix/tasks/pleroma/email.ex b/lib/mix/tasks/pleroma/email.ex
index 61d431971..c0bef0386 100644
--- a/lib/mix/tasks/pleroma/email.ex
+++ b/lib/mix/tasks/pleroma/email.ex
@@ -34,7 +34,7 @@ defmodule Mix.Tasks.Pleroma.Email do
     |> Pleroma.RepoStreamer.chunk_stream(500)
     |> Stream.each(fn users ->
       users
-      |> Enum.each(fn user -> Pleroma.User.send_confirmation_email(user) end)
+      |> Enum.each(fn user -> Pleroma.User.try_send_confirmation_email(user) end)
     end)
     |> Stream.run()
   end
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 603fc3b44..9dea39619 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -814,7 +814,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}