X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3aa8ffbcb8fa60a71f3f58b869ecd10bb397fd10..3acada409a9521885b4b3b553087747a15ae8dc3:/app/models/notifier.rb?ds=sidebyside diff --git a/app/models/notifier.rb b/app/models/notifier.rb index 852ed34f8..b9b81a889 100644 --- a/app/models/notifier.rb +++ b/app/models/notifier.rb @@ -1,8 +1,10 @@ + class Notifier < ActionMailer::Base def signup_confirm(user, token) recipients user.email from "webmaster@openstreetmap.org" subject "[OpenStreetMap] Confirm your email address" + headers "Auto-Submitted" => "auto-generated" body :url => url_for(:host => SERVER_URL, :controller => "user", :action => "confirm", :confirm_string => token.token) @@ -12,6 +14,7 @@ class Notifier < ActionMailer::Base recipients user.email from "webmaster@openstreetmap.org" subject "[OpenStreetMap] Password reset request" + headers "Auto-Submitted" => "auto-generated" body :url => url_for(:host => SERVER_URL, :controller => "user", :action => "reset_password", :email => user.email, :token => token.token) @@ -21,6 +24,7 @@ class Notifier < ActionMailer::Base recipients user.email from "webmaster@openstreetmap.org" subject "[OpenStreetMap] Password reset" + headers "Auto-Submitted" => "auto-generated" body :pass => pass end @@ -28,6 +32,7 @@ class Notifier < ActionMailer::Base recipients trace.user.email from "webmaster@openstreetmap.org" subject "[OpenStreetMap] GPX Import success" + headers "Auto-Submitted" => "auto-generated" body :trace_name => trace.name, :trace_points => trace.size, :possible_points => possible_points @@ -37,6 +42,7 @@ class Notifier < ActionMailer::Base recipients trace.user.email from "webmaster@openstreetmap.org" subject "[OpenStreetMap] GPX Import failure" + headers "Auto-Submitted" => "auto-generated" body :trace_name => trace.name, :error => error end @@ -45,6 +51,7 @@ class Notifier < ActionMailer::Base recipients message.recipient.email from "webmaster@openstreetmap.org" subject "[OpenStreetMap] #{message.sender.display_name} sent you a new message" + headers "Auto-Submitted" => "auto-generated" body :to_user => message.recipient.display_name, :from_user => message.sender.display_name, :body => message.body, @@ -53,8 +60,36 @@ class Notifier < ActionMailer::Base :controller => "message", :action => "read", :message_id => message.id), :replyurl => url_for(:host => SERVER_URL, - :controller => "message", :action => "new", - :user_id => message.from_user_id) + :controller => "message", :action => "reply", + :message_id => message.id) + end + + def diary_comment_notification(comment) + recipients comment.diary_entry.user.email + from "webmaster@openstreetmap.org" + subject "[OpenStreetMap] #{comment.user.display_name} commented on your diary entry" + headers "Auto-Submitted" => "auto-generated" + body :to_user => comment.diary_entry.user.display_name, + :from_user => comment.user.display_name, + :body => comment.body, + :subject => comment.diary_entry.title, + :readurl => url_for(:host => SERVER_URL, + :controller => "diary_entry", + :action => "view", + :display_name => comment.diary_entry.user.display_name, + :id => comment.diary_entry.id, + :anchor => "comment#{comment.id}"), + :commenturl => url_for(:host => SERVER_URL, + :controller => "diary_entry", + :action => "view", + :display_name => comment.diary_entry.user.display_name, + :id => comment.diary_entry.id, + :anchor => "newcomment"), + :replyurl => url_for(:host => SERVER_URL, + :controller => "message", + :action => "new", + :user_id => comment.user.id, + :title => "Re: #{comment.diary_entry.title}") end def friend_notification(friend) @@ -64,6 +99,7 @@ class Notifier < ActionMailer::Base recipients befriendee.email from "webmaster@openstreetmap.org" subject "[OpenStreetMap] #{befriender.display_name} added you as a friend" + headers "Auto-Submitted" => "auto-generated" body :user => befriender.display_name, :userurl => url_for(:host => SERVER_URL, :controller => "user", :action => "view",