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/web/admin_api/admin_api_controller.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/web/admin_api/admin_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/admin_api/admin_api_controller.ex | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex index 70a5b5c5d..c436715d5 100644 --- a/lib/pleroma/web/admin_api/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/admin_api_controller.ex @@ -238,8 +238,13 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do !Pleroma.Config.get([:instance, :registrations_open]), {:ok, invite_token} <- UserInviteToken.create_invite(), email <- - Pleroma.UserEmail.user_invitation_email(user, invite_token, email, params["name"]), - {:ok, _} <- Pleroma.Mailer.deliver(email) do + Pleroma.Emails.UserEmail.user_invitation_email( + user, + invite_token, + email, + params["name"] + ), + {:ok, _} <- Pleroma.Emails.Mailer.deliver(email) do json_response(conn, :no_content, "") end end |