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

Added helper function set_references for mail header

Browse source
This commit is contained in:
mmd-osm 2019-12-30 23:04:15 +01:00
parent ffe636e6bd
commit 480eaa1b36
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/mailers/notifier.rb
View file

@ -94,13 +94,11 @@ 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
set_references("diary", comment.diary_entry)
mail :from => from_address(comment.user.display_name, "c", comment.id, comment.digest, recipient.id),
:to => recipient.email,
@ -129,7 +127,6 @@ 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
@ -140,8 +137,7 @@ class Notifier < ApplicationMailer
@author = @commenter
attach_user_avatar(comment.author)
headers["In-Reply-To"] = @ref
headers["References"] = @ref
set_references("note", comment.note)
subject = if @owner
I18n.t("notifier.note_comment_notification.#{@event}.subject_own", :commenter => @commenter)
@ -164,7 +160,6 @@ 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)
@ -174,8 +169,7 @@ class Notifier < ApplicationMailer
attach_user_avatar(comment.author)
headers["In-Reply-To"] = @ref
headers["References"] = @ref
set_references("changeset", comment.changeset)
mail :to => recipient.email, :subject => subject
end
@ -221,4 +215,10 @@ class Notifier < ApplicationMailer
Settings.email_from
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