IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add a better from address to the email

Browse Source
This commit is contained in:
Robin Ward
2013-02-27 18:30:14 -05:00
parent 7c1ae451fe
commit 421f048458
4 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/mailers/user_notifications.rb
View File

@@ -63,15 +63,25 @@ class UserNotifications < ActionMailer::Base
@post = opts[:post]
return unless @post.present?
username = @notification.data_hash[:display_username]
notification_type = Notification.InvertedTypes[opts[:notification].notification_type].to_s
build_email user.email,
"user_notifications.user_#{notification_type}",
topic_title: @notification.data_hash[:topic_title],
message: @post.raw,
url: @post.url,
username: @notification.data_hash[:display_username],
add_unsubscribe_link: true
email_opts = {
topic_title: @notification.data_hash[:topic_title],
message: @post.raw,
url: @post.url,
username: username,
add_unsubscribe_link: true
}
# If we have a display name, change the from address
if username.present?
email_opts[:from] = "\"#{username} @ #{SiteSetting.title}\" <#{SiteSetting.notification_email}>"
end
email = build_email user.email, "user_notifications.user_#{notification_type}", email_opts
end
alias :user_invited_to_private_message :notification_template
alias :user_replied :notification_template
alias :user_quoted :notification_template