From: lambda <lain@soykaf.club>
Date: Fri, 12 Apr 2019 10:41:09 +0000 (+0000)
Subject: Merge branch 'bugfix/pleroma-email-naming' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=184ae60b217f4e3a79aad538717d1cf35f10291a;p=akkoma

Merge branch 'bugfix/pleroma-email-naming' into 'develop'

Make the filename and module name of Pleroma.Emails.* orthogonal

See merge request pleroma/pleroma!1029
---

184ae60b217f4e3a79aad538717d1cf35f10291a
diff --cc lib/pleroma/web/admin_api/admin_api_controller.ex
index 70a5b5c5d,3366e7275..c436715d5
--- a/lib/pleroma/web/admin_api/admin_api_controller.ex
+++ b/lib/pleroma/web/admin_api/admin_api_controller.ex
@@@ -236,10 -235,15 +236,15 @@@ defmodule Pleroma.Web.AdminAPI.AdminAPI
      with true <-
             Pleroma.Config.get([:instance, :invites_enabled]) &&
               !Pleroma.Config.get([:instance, :registrations_open]),
 -         {:ok, invite_token} <- Pleroma.UserInviteToken.create_token(),
 +         {: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