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

Add unsubscribe link to diary comment notification email

Browse source
This commit is contained in:
Anton Khorev 2024-02-17 06:16:42 +03:00
parent 3a873b1668
commit a07df4c67b
5 changed files with 23 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/mailers/user_mailer.rb
View file

@ -97,6 +97,7 @@ class UserMailer < 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}" })
@unsubscribeurl = diary_entry_unsubscribe_url(comment.diary_entry.user, comment.diary_entry)
@author = @from_user
attach_user_avatar(comment.user)

3
app/views/user_mailer/diary_comment_notification.html.erb
View file

@ -15,4 +15,7 @@
:commenturl => link_to(@commenturl, @commenturl) + tag.br,
:replyurl => link_to(@replyurl, @replyurl) %>
</p>
<p><%= t ".footer_unsubscribe_html",
:unsubscribeurl => link_to(@unsubscribeurl, @unsubscribeurl) %>
</p>
<% end %>

2
app/views/user_mailer/diary_comment_notification.text.erb
View file

@ -7,3 +7,5 @@
==
<%= t '.footer', :readurl => @readurl, :commenturl => @commenturl, :replyurl => @replyurl %>
<%= t '.footer_unsubscribe', :unsubscribeurl => @unsubscribeurl %>

2
config/locales/en.yml
View file

@ -1577,6 +1577,8 @@ en:
header_html: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
footer_html: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
footer_unsubscribe: "You can unsubscribe from the discussion at %{unsubscribeurl}"
footer_unsubscribe_html: "You can unsubscribe from the discussion at %{unsubscribeurl}"
message_notification:
subject: "[OpenStreetMap] %{message_title}"
hi: "Hi %{to_user},"

15
test/mailers/user_mailer_test.rb
View file

@ -53,4 +53,19 @@ class UserMailerTest < ActionMailer::TestCase
assert_match("Jack & Jill <br>", email.text_part.body.to_s)
assert_match("Jack &amp; Jill &lt;br&gt;", email.html_part.body.to_s)
end
def test_diary_comment_notification
create(:language, :code => "en")
user = create(:user)
other_user = create(:user)
diary_entry = create(:diary_entry, :user => user)
diary_comment = create(:diary_comment, :diary_entry => diary_entry)
email = UserMailer.diary_comment_notification(diary_comment, other_user)
body = Rails::Dom::Testing.html_document_fragment.parse(email.html_part.body)
url = Rails.application.routes.url_helpers.diary_entry_url(user, diary_entry, :host => Settings.server_url, :protocol => Settings.server_protocol)
unsubscribe_url = Rails.application.routes.url_helpers.diary_entry_unsubscribe_url(user, diary_entry, :host => Settings.server_url, :protocol => Settings.server_protocol)
assert_select body, "a[href^='#{url}']"
assert_select body, "a[href='#{unsubscribe_url}']", :count => 1
end
end