squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Assert on the success of enqueue before returning"

Browse Source 
This reverts commit 16d8c8b33b.
Because it breaks everything
This commit is contained in:
Sadposter 2019-04-14 16:12:54 +01:00
parent 16d8c8b33b
commit e513504e88
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/pleroma/user.ex
View File

@ -278,10 +278,9 @@ defmodule Pleroma.User do
def try_send_confirmation_email(%User{} = user) do def try_send_confirmation_email(%User{} = user) do
if user.info.confirmation_pending && if user.info.confirmation_pending &&
Pleroma.Config.get([:instance, :account_activation_required]) do Pleroma.Config.get([:instance, :account_activation_required]) do
:ok = user
user |> Pleroma.Emails.UserEmail.account_confirmation_email()
|> Pleroma.Emails.UserEmail.account_confirmation_email() |> Pleroma.Emails.Mailer.deliver_async()
|> Pleroma.Emails.Mailer.deliver_async()
{:ok, :enqueued} {:ok, :enqueued}
else else