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

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

See merge request pleroma/pleroma!1029

diff --cc lib/pleroma/user.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge

diff --cc lib/pleroma/web/admin_api/admin_api_controller.ex
index 70a5b5c5d7dbf4cfaf3821f9978c0453c0345175,3366e7275ca79f26abd4246d963f3a25ca61512c..c436715d5d67227116f16743011c508223819ef3
--- 1/lib/pleroma/web/admin_api/admin_api_controller.ex
--- 2/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

diff --cc lib/pleroma/web/twitter_api/twitter_api.ex
Simple merge

diff --cc test/web/admin_api/admin_api_controller_test.exs
Simple merge

diff --cc test/web/twitter_api/twitter_api_test.exs
Simple merge