From 2083000027451249836c369eb961300d7faf5f99 Mon Sep 17 00:00:00 2001
From: "Akihiko Odaki (@fn_aki@pawoo.net)" <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Fri, 7 Jul 2017 07:12:12 +0900
Subject: [PATCH] Set default From address in config (#3756)

The old implementation sets default From address in mailers. It sets
the address from SMTP_FROM_ADDRESS, or notifications@localhost. The
behavior is occasionally undesired results.

In production environment, notifications@localhost is likely to be
incorrect.
In testing environment, the email address should not be varied by a
environment variable.

After appling this change,

In production environment, it will throw an exception when launching
Mastodon.
In testing environment, the address will be fixed with
notifications@localhost.
---
 app/mailers/application_mailer.rb  | 1 -
 app/mailers/user_mailer.rb         | 1 -
 config/environments/development.rb | 2 ++
 config/environments/production.rb  | 2 ++
 config/environments/test.rb        | 2 ++
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index 2e730c19b0..95b770ff11 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class ApplicationMailer < ActionMailer::Base
-  default from: ENV.fetch('SMTP_FROM_ADDRESS') { 'notifications@localhost' }
   layout 'mailer'
   helper :instance
 
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 6abf9c9caf..1517c027e8 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class UserMailer < Devise::Mailer
-  default from: ENV.fetch('SMTP_FROM_ADDRESS') { 'notifications@localhost' }
   layout 'mailer'
 
   helper :instance
diff --git a/config/environments/development.rb b/config/environments/development.rb
index c81cf7bbed..406fa970b2 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -62,6 +62,8 @@ Rails.application.configure do
   # routes, locales, etc. This feature depends on the listen gem.
   # config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 
+  config.action_mailer.default_options = { from: 'notifications@localhost' }
+
   # If using a Heroku, Vagrant or generic remote development environment,
   # use letter_opener_web, accessible at  /letter_opener.
   # Otherwise, use letter_opener, which launches a browser window to view sent mail.
diff --git a/config/environments/production.rb b/config/environments/production.rb
index bd87d79a78..d9c9da684f 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -73,6 +73,8 @@ Rails.application.configure do
   config.action_mailer.perform_caching = false
 
   # E-mails
+  config.action_mailer.default_options = { from: ENV.fetch('SMTP_FROM_ADDRESS') }
+
   config.action_mailer.smtp_settings = {
     :port                 => ENV['SMTP_PORT'],
     :address              => ENV['SMTP_SERVER'],
diff --git a/config/environments/test.rb b/config/environments/test.rb
index db98263a64..bde69eba15 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -30,6 +30,8 @@ Rails.application.configure do
   config.action_controller.allow_forgery_protection = false
   config.action_mailer.perform_caching = false
 
+  config.action_mailer.default_options = { from: 'notifications@localhost' }
+
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.