Move mailer from Bamboo to Swoosh
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
@@ -3,9 +3,7 @@ defmodule Mobilizon.Web.Email.Admin do
|
||||
Handles emails sent to admins.
|
||||
"""
|
||||
|
||||
use Bamboo.Phoenix, view: Mobilizon.Web.EmailView
|
||||
|
||||
import Bamboo.Phoenix
|
||||
use Phoenix.Swoosh, view: Mobilizon.Web.EmailView
|
||||
|
||||
import Mobilizon.Web.Gettext
|
||||
|
||||
@@ -15,7 +13,7 @@ defmodule Mobilizon.Web.Email.Admin do
|
||||
|
||||
alias Mobilizon.Web.Email
|
||||
|
||||
@spec report(User.t(), Report.t()) :: Bamboo.Email.t()
|
||||
@spec report(User.t(), Report.t()) :: Swoosh.Email.t()
|
||||
def report(%User{email: email} = user, %Report{} = report) do
|
||||
locale = Map.get(user, :locale, "en")
|
||||
Gettext.put_locale(locale)
|
||||
@@ -26,14 +24,12 @@ defmodule Mobilizon.Web.Email.Admin do
|
||||
instance: Config.instance_name()
|
||||
)
|
||||
|
||||
Email.base_email(to: email, subject: subject)
|
||||
|> assign(:locale, locale)
|
||||
|> assign(:subject, subject)
|
||||
|> assign(:report, report)
|
||||
|> render(:report)
|
||||
[to: email, subject: subject]
|
||||
|> Email.base_email()
|
||||
|> render_body(:report, %{locale: locale, subject: subject, report: report})
|
||||
end
|
||||
|
||||
@spec user_email_change_old(User.t(), String.t()) :: Bamboo.Email.t()
|
||||
@spec user_email_change_old(User.t(), String.t()) :: Swoosh.Email.t()
|
||||
def user_email_change_old(
|
||||
%User{
|
||||
locale: user_locale,
|
||||
@@ -49,16 +45,18 @@ defmodule Mobilizon.Web.Email.Admin do
|
||||
instance: Config.instance_name()
|
||||
)
|
||||
|
||||
Email.base_email(to: old_email, subject: subject)
|
||||
|> assign(:locale, user_locale)
|
||||
|> assign(:subject, subject)
|
||||
|> assign(:new_email, new_email)
|
||||
|> assign(:old_email, old_email)
|
||||
|> assign(:offer_unsupscription, false)
|
||||
|> render(:admin_user_email_changed_old)
|
||||
[to: old_email, subject: subject]
|
||||
|> Email.base_email()
|
||||
|> render_body(:admin_user_email_changed_old, %{
|
||||
locale: user_locale,
|
||||
subject: subject,
|
||||
new_email: new_email,
|
||||
old_email: old_email,
|
||||
offer_unsupscription: false
|
||||
})
|
||||
end
|
||||
|
||||
@spec user_email_change_new(User.t(), String.t()) :: Bamboo.Email.t()
|
||||
@spec user_email_change_new(User.t(), String.t()) :: Swoosh.Email.t()
|
||||
def user_email_change_new(
|
||||
%User{
|
||||
locale: user_locale,
|
||||
@@ -74,16 +72,18 @@ defmodule Mobilizon.Web.Email.Admin do
|
||||
instance: Config.instance_name()
|
||||
)
|
||||
|
||||
Email.base_email(to: new_email, subject: subject)
|
||||
|> assign(:locale, user_locale)
|
||||
|> assign(:subject, subject)
|
||||
|> assign(:old_email, old_email)
|
||||
|> assign(:new_email, new_email)
|
||||
|> assign(:offer_unsupscription, false)
|
||||
|> render(:admin_user_email_changed_new)
|
||||
[to: old_email, subject: subject]
|
||||
|> Email.base_email()
|
||||
|> render_body(:admin_user_email_changed_new, %{
|
||||
locale: user_locale,
|
||||
subject: subject,
|
||||
new_email: new_email,
|
||||
old_email: old_email,
|
||||
offer_unsupscription: false
|
||||
})
|
||||
end
|
||||
|
||||
@spec user_role_change(User.t(), atom()) :: Bamboo.Email.t()
|
||||
@spec user_role_change(User.t(), atom()) :: Swoosh.Email.t()
|
||||
def user_role_change(
|
||||
%User{
|
||||
locale: user_locale,
|
||||
@@ -100,16 +100,18 @@ defmodule Mobilizon.Web.Email.Admin do
|
||||
instance: Config.instance_name()
|
||||
)
|
||||
|
||||
Email.base_email(to: email, subject: subject)
|
||||
|> assign(:locale, user_locale)
|
||||
|> assign(:subject, subject)
|
||||
|> assign(:old_role, old_role)
|
||||
|> assign(:new_role, new_role)
|
||||
|> assign(:offer_unsupscription, false)
|
||||
|> render(:admin_user_role_changed)
|
||||
[to: email, subject: subject]
|
||||
|> Email.base_email()
|
||||
|> render_body(:admin_user_role_changed, %{
|
||||
locale: user_locale,
|
||||
subject: subject,
|
||||
old_role: old_role,
|
||||
new_role: new_role,
|
||||
offer_unsupscription: false
|
||||
})
|
||||
end
|
||||
|
||||
@spec user_confirmation(User.t()) :: Bamboo.Email.t()
|
||||
@spec user_confirmation(User.t()) :: Swoosh.Email.t()
|
||||
def user_confirmation(%User{
|
||||
locale: user_locale,
|
||||
email: email
|
||||
@@ -122,10 +124,12 @@ defmodule Mobilizon.Web.Email.Admin do
|
||||
instance: Config.instance_name()
|
||||
)
|
||||
|
||||
Email.base_email(to: email, subject: subject)
|
||||
|> assign(:locale, user_locale)
|
||||
|> assign(:subject, subject)
|
||||
|> assign(:offer_unsupscription, false)
|
||||
|> render(:admin_user_confirmation)
|
||||
[to: email, subject: subject]
|
||||
|> Email.base_email()
|
||||
|> render_body(:admin_user_confirmation, %{
|
||||
locale: user_locale,
|
||||
subject: subject,
|
||||
offer_unsupscription: false
|
||||
})
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user