s/Pleroma.Mailer/Pleroma.Emails.Mailer/
This commit is contained in:
parent
0ab563d334
commit
1791ee8ec4
10 changed files with 20 additions and 12 deletions
|
|
@ -2,7 +2,7 @@
|
|||
# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
|
||||
# SPDX-License-Identifier: AGPL-3.0-only
|
||||
|
||||
defmodule Pleroma.Mailer do
|
||||
defmodule Pleroma.Emails.Mailer do
|
||||
use Swoosh.Mailer, otp_app: :pleroma
|
||||
|
||||
def deliver_async(email, config \\ []) do
|
||||
|
|
|
|||
|
|
@ -280,7 +280,7 @@ defmodule Pleroma.User do
|
|||
Pleroma.Config.get([:instance, :account_activation_required]) do
|
||||
user
|
||||
|> Pleroma.UserEmail.account_confirmation_email()
|
||||
|> Pleroma.Mailer.deliver_async()
|
||||
|> Pleroma.Emails.Mailer.deliver_async()
|
||||
else
|
||||
{:ok, :noop}
|
||||
end
|
||||
|
|
|
|||
|
|
@ -450,7 +450,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
|
|||
Enum.each(User.all_superusers(), fn superuser ->
|
||||
superuser
|
||||
|> Pleroma.AdminEmail.report(actor, account, statuses, content)
|
||||
|> Pleroma.Mailer.deliver_async()
|
||||
|> Pleroma.Emails.Mailer.deliver_async()
|
||||
end)
|
||||
|
||||
{:ok, activity}
|
||||
|
|
|
|||
|
|
@ -238,7 +238,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
|
|||
{:ok, invite_token} <- Pleroma.UserInviteToken.create_token(),
|
||||
email <-
|
||||
Pleroma.UserEmail.user_invitation_email(user, invite_token, email, params["name"]),
|
||||
{:ok, _} <- Pleroma.Mailer.deliver(email) do
|
||||
{:ok, _} <- Pleroma.Emails.Mailer.deliver(email) do
|
||||
json_response(conn, :no_content, "")
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
|
||||
alias Pleroma.Activity
|
||||
alias Pleroma.Mailer
|
||||
alias Pleroma.Emails.Mailer
|
||||
alias Pleroma.Repo
|
||||
alias Pleroma.User
|
||||
alias Pleroma.UserEmail
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue