Skip to content

Commit 067d7f2

Browse files
committed
Set email sender's display name to "NZOI Training"
Ideally it should be configurable, but we hard-code it for now like in other places for simplicity. Suggested-by: Jonathan Khoo <[email protected]>
1 parent 9355c21 commit 067d7f2

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

config/initializers/mailer.rb

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
# use db stored username, password, etc. for email
22

3+
def email_address_with_name(address, name)
4+
# can switch to ActionMailer::Base.email_address_with_name() once we upgrade to Rails 6
5+
Mail::Address.new.tap do |builder|
6+
builder.address = address
7+
builder.display_name = name.presence
8+
end.to_s
9+
end
10+
311
if ActiveRecord::Base.connection.table_exists?(Setting.table_name)
4-
ActionMailer::Base.smtp_settings[:user_name] = Setting.find_by_key("system/mailer/email")&.value
12+
email_setting = Setting.find_by_key("system/mailer/email")
13+
ActionMailer::Base.smtp_settings[:user_name] = email_setting&.value
514
ActionMailer::Base.smtp_settings[:password] = Setting.find_by_key("system/mailer/password")&.value
6-
ActionMailer::Base.default from: Setting.find_by_key("system/mailer/email").value if Setting.find_by_key("system/mailer/email")&.value.present?
15+
ActionMailer::Base.default from: email_address_with_name(email_setting.value, "NZOI Training") if email_setting&.value.present?
716
end
817

0 commit comments

Comments
 (0)