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

Merge remote-tracking branch 'upstream/pull/2462'

Browse source
This commit is contained in:
Tom Hughes 2019-12-30 22:29:24 +00:00
commit 29aac6e149
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,12 @@ class Notifier < ApplicationMailer
@readurl = diary_entry_url(comment.diary_entry.user, comment.diary_entry, :anchor => "comment#{comment.id}") @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") @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}" }) @replyurl = new_message_url(comment.user, :message => { :title => "Re: #{comment.diary_entry.title}" })
@author = @from_user @author = @from_user
attach_user_avatar(comment.user) attach_user_avatar(comment.user)
set_references("diary", comment.diary_entry)
mail :from => from_address(comment.user.display_name, "c", comment.id, comment.digest, recipient.id), mail :from => from_address(comment.user.display_name, "c", comment.id, comment.digest, recipient.id),
:to => recipient.email, :to => recipient.email,
:subject => I18n.t("notifier.diary_comment_notification.subject", :user => comment.user.display_name) :subject => I18n.t("notifier.diary_comment_notification.subject", :user => comment.user.display_name)
@ -136,6 +137,8 @@ class Notifier < ApplicationMailer
@author = @commenter @author = @commenter
attach_user_avatar(comment.author) attach_user_avatar(comment.author)
set_references("note", comment.note)
subject = if @owner subject = if @owner
I18n.t("notifier.note_comment_notification.#{@event}.subject_own", :commenter => @commenter) I18n.t("notifier.note_comment_notification.#{@event}.subject_own", :commenter => @commenter)
else else
@ -166,6 +169,8 @@ class Notifier < ApplicationMailer
attach_user_avatar(comment.author) attach_user_avatar(comment.author)
set_references("changeset", comment.changeset)
mail :to => recipient.email, :subject => subject mail :to => recipient.email, :subject => subject
end end
end end
@ -210,4 +215,10 @@ class Notifier < ApplicationMailer
Settings.email_from Settings.email_from
end end
end end
def set_references(scope, reference_object)
ref = "osm-#{scope}-#{reference_object.id}@#{Settings.server_url}"
headers["In-Reply-To"] = ref
headers["References"] = ref
end
end end