X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/425b3654d711eb01a8ce5511a123cc4c24b6db02..112950ca3afd95c8b63e69f7b580585529b6cbaf:/app/models/notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index bc4db6477..b9b81a889 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -1,3 +1,4 @@
+
 class Notifier < ActionMailer::Base
   def signup_confirm(user, token)
     recipients user.email
@@ -59,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)