cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add In-Reply-To, References headers to email

Browse source 
Closes https://github.com/openstreetmap/openstreetmap-website/issues/2430
This commit is contained in:
mmd 2019-12-12 10:40:01 +01:00 • committed by mmd-osm
parent cfbd10b27b
commit ffe636e6bd
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/mailers/notifier.rb
View file

@ -94,11 +94,14 @@ class Notifier < ApplicationMailer
@readurl = diary_entry_url(comment.diary_entry.user, comment.diary_entry, :anchor => "comment#{comment.id}")
@commenturl = diary_entry_url(comment.diary_entry.user, comment.diary_entry, :anchor => "newcomment")
@replyurl = new_message_url(comment.user, :message => { :title => "Re: #{comment.diary_entry.title}" })
@ref = "osm-diary-#{comment.diary_entry.id}@#{Settings.server_url}"
@author = @from_user
attach_user_avatar(comment.user)
headers["In-Reply-To"] = @ref
headers["References"] = @ref
mail :from => from_address(comment.user.display_name, "c", comment.id, comment.digest, recipient.id),
:to => recipient.email,
:subject => I18n.t("notifier.diary_comment_notification.subject", :user => comment.user.display_name)
@ -126,6 +129,7 @@ class Notifier < ApplicationMailer
@comment = comment.body
@owner = recipient == comment.note.author
@event = comment.event
@ref = "osm-note-#{comment.note.id}@#{Settings.server_url}"
@commenter = if comment.author
comment.author.display_name
@ -136,6 +140,9 @@ class Notifier < ApplicationMailer
@author = @commenter
attach_user_avatar(comment.author)
headers["In-Reply-To"] = @ref
headers["References"] = @ref
subject = if @owner
I18n.t("notifier.note_comment_notification.#{@event}.subject_own", :commenter => @commenter)
else
@ -157,6 +164,7 @@ class Notifier < ApplicationMailer
@time = comment.created_at
@changeset_author = comment.changeset.user.display_name
@author = @commenter
@ref = "osm-changeset-#{comment.changeset.id}@#{Settings.server_url}"
subject = if @owner
I18n.t("notifier.changeset_comment_notification.commented.subject_own", :commenter => @commenter)
@ -166,6 +174,9 @@ class Notifier < ApplicationMailer
attach_user_avatar(comment.author)
headers["In-Reply-To"] = @ref
headers["References"] = @ref
mail :to => recipient.email, :subject => subject
end
end