diff options
author | lambda <lain@soykaf.club> | 2019-04-12 10:41:09 +0000 |
---|---|---|
committer | lambda <lain@soykaf.club> | 2019-04-12 10:41:09 +0000 |
commit | 184ae60b217f4e3a79aad538717d1cf35f10291a (patch) | |
tree | ce7633ae3f388e1cf7618d39512a196ec59c93f3 /lib/pleroma/web/admin_api/admin_api_controller.ex | |
parent | 0a09692c7decdcaa8c15e5f8eaf10d9e7d16a5e5 (diff) | |
parent | 9c1b36856b97a7f86e60ad23ef374449c1910c7a (diff) | |
download | pleroma-184ae60b217f4e3a79aad538717d1cf35f10291a.tar.gz |
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029
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 |