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

Add standard List-XXX headers to some notification messages

Browse source
This commit is contained in:
Tom Hughes 2024-02-24 09:57:21 +00:00
parent f0764d3eca
commit 8f3838fada
2 changed files with 32 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

29
app/mailers/user_mailer.rb
View file

@ -104,6 +104,14 @@ class UserMailer < ApplicationMailer
set_references("diary", comment.diary_entry)
set_list_headers(
"#{comment.diary_entry.id}.diary.www.openstreetmap.org",
t(".description", :id => comment.diary_entry.id),
:archive => @readurl,
:subscribe => diary_entry_subscribe_url(comment.diary_entry.user, comment.diary_entry),
:unsubscribe => @unsubscribeurl
)
mail :from => from_address(comment.user.display_name, "c", comment.id, comment.notification_token(recipient.id), recipient.id),
:to => recipient.email,
:subject => t(".subject", :user => comment.user.display_name)
@ -142,6 +150,12 @@ class UserMailer < ApplicationMailer
set_references("note", comment.note)
set_list_headers(
"#{comment.note.id}.note.www.openstreetmap.org",
t(".description", :id => comment.note.id),
:archive => @noteurl
)
subject = if @owner
t(".#{@event}.subject_own", :commenter => @commenter)
else
@ -175,6 +189,14 @@ class UserMailer < ApplicationMailer
set_references("changeset", comment.changeset)
set_list_headers(
"#{comment.changeset.id}.changeset.www.openstreetmap.org",
t(".description", :id => comment.changeset.id),
:subscribe => changeset_subscribe_url(comment.changeset),
:unsubscribe => @unsubscribe_url,
:archive => @changeset_url
)
mail :to => recipient.email, :subject => subject
end
end
@ -247,4 +269,11 @@ class UserMailer < ApplicationMailer
headers["In-Reply-To"] = ref
headers["References"] = ref
end
def set_list_headers(id, description, options = {})
headers["List-ID"] = "#{description} <#{id}>"
headers["List-Archive"] = "<#{options[:archive]}>" if options[:archive]
headers["List-Subscribe"] = "<#{options[:subscribe]}>" if options[:subscribe]
headers["List-Unsubscribe"] = "<#{options[:unsubscribe]}>" if options[:unsubscribe]
end
end