diff options
| author | Roman Chvanikov <chvanikoff@gmail.com> | 2019-04-14 14:05:21 +0700 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@gmail.com> | 2019-04-14 14:05:21 +0700 |
| commit | 0cd4b6024d043efb096a353d6bd84ea0aeb74a6f (patch) | |
| tree | 359bbd63d213dbbf4c798a86e8804eaf6f047234 /lib/pleroma/web/admin_api/admin_api_controller.ex | |
| parent | 371a4aed2ca9f6926e49f6791c8b4d14292d20e5 (diff) | |
| parent | 7304e0ce18776d4ace969a8a1b737a60635376d6 (diff) | |
| download | pleroma-0cd4b6024d043efb096a353d6bd84ea0aeb74a6f.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
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 |