diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-22 13:08:30 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-22 13:08:30 +0700 |
| commit | e8c2f9a73a37636a9a8ed5c2998617b841f482da (patch) | |
| tree | 4b194e631d2bbb58b8522c3d74a0b0c2ea09fedd /lib/pleroma/user.ex | |
| parent | 38926a063a39c4d4387049f5d364f72a9f8bd2de (diff) | |
| parent | 7fcbda702e76b6390076c28832f5aea80086d15a (diff) | |
| download | pleroma-e8c2f9a73a37636a9a8ed5c2998617b841f482da.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
Diffstat (limited to 'lib/pleroma/user.ex')
| -rw-r--r-- | lib/pleroma/user.ex | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 95f5c6d21..6aaa3244f 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -294,8 +294,10 @@ defmodule Pleroma.User do if user.info.confirmation_pending && Pleroma.Config.get([:instance, :account_activation_required]) do user - |> Pleroma.UserEmail.account_confirmation_email() - |> Pleroma.Mailer.deliver_async() + |> Pleroma.Emails.UserEmail.account_confirmation_email() + |> Pleroma.Emails.Mailer.deliver_async() + + {:ok, :enqueued} else {:ok, :noop} end |