potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

Merge branch 'fix-emails-missing-headers' into 'master'

Browse source 
Fix email missing headers

Closes #491 et #426

See merge request framasoft/mobilizon!698
This commit is contained in:
Thomas Citharel 2020-11-13 18:13:40 +01:00
parent dbc525efca 782c01e85d
commit 23e92643b7
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/web/email/email.ex
View file

@ -5,8 +5,8 @@ defmodule Mobilizon.Web.Email do
use Bamboo.Phoenix, view: Mobilizon.Web.EmailView
alias Ecto.UUID
alias Mobilizon.Config
alias Mobilizon.Web.EmailView
@spec base_email(keyword()) :: Bamboo.Email.t()
@ -17,8 +17,27 @@ defmodule Mobilizon.Web.Email do
|> new_email()
|> from({Config.instance_name(), Config.instance_email_from()})
|> put_header("Reply-To", Config.instance_email_reply_to())
|> put_header("Date", date())
|> put_header("Message-Id", message_id())
|> assign(:instance, instance)
|> put_html_layout({EmailView, "email.html"})
|> put_text_layout({EmailView, "email.text"})
end
# Generating an UUID randomly causes Bamboo.Test.assert_delivered_email/1 to fail
defp message_id do
if Application.fetch_env!(:mobilizon, :env) == :test do
"TEST_ENV_MESSAGE_ID@#{Config.instance_hostname()}"
else
"#{UUID.generate()}@#{Config.instance_hostname()}"
end
end
defp date do
if Application.fetch_env!(:mobilizon, :env) == :test do
"REMOVED FOR TESTING"
else
Timex.format!(Timex.local(), "{WDshort}, {D} {Mshort} {YYYY} {h24}:{m}:{s} {Z}")
end
end
end