Merge -r 20198:20540 from trunc into openstreetbugs branch

[rails.git] / app / models / notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 35b521e1fdfdd4918f82f3aa604a97a4f7b331d4..df30d651bd75ce4d678ee12ec799587f202b8cb8 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -47,6 +47,7 @@ class Notifier < ActionMailer::Base
   
   def message_notification(message)
     common_headers message.recipient
+    from_header message.sender.display_name, "m", message.id, message.digest
     subject I18n.t('notifier.message_notification.subject', :user => message.sender.display_name, :locale => locale)
     body :to_user => message.recipient.display_name,
          :from_user => message.sender.display_name,
@@ -62,6 +63,7 @@ class Notifier < ActionMailer::Base
 
   def diary_comment_notification(comment)
     common_headers comment.diary_entry.user
+    from_header comment.user.display_name, "c", comment.id, comment.digest
     subject I18n.t('notifier.diary_comment_notification.subject', :user => comment.user.display_name, :locale => locale)
     body :to_user => comment.diary_entry.user.display_name,
          :from_user => comment.user.display_name,
@@ -82,20 +84,14 @@ class Notifier < ActionMailer::Base
          :replyurl => url_for(:host => SERVER_URL,
                               :controller => "message",
                               :action => "new",
-                              :user_id => comment.user.id,
+                              :display_name => comment.user.display_name,
                               :title => "Re: #{comment.diary_entry.title}")
   end
 
   def friend_notification(friend)
-    befriender = User.find_by_id(friend.user_id)
-    befriendee = User.find_by_id(friend.friend_user_id)
-
-    common_headers befriendee
-    subject I18n.t('notifier.friend_notification.subject', :user => befriender.display_name, :locale => locale)
-    body :user => befriender.display_name,
-         :userurl => url_for(:host => SERVER_URL,
-                             :controller => "user", :action => "view",
-                             :display_name => befriender.display_name)
+    common_headers friend.befriendee
+    subject I18n.t('notifier.friend_notification.subject', :user => friend.befriender.display_name, :locale => locale)
+    body :friend => friend
   end
 
 private
@@ -103,8 +99,14 @@ private
   def common_headers(recipient)
     recipients recipient.email
     locale recipient.preferred_language_from(I18n.available_locales)
-    from "webmaster@openstreetmap.org"
+    from "OpenStreetMap <webmaster@openstreetmap.org>"
     headers "return-path" => "bounces@openstreetmap.org",
             "Auto-Submitted" => "auto-generated"
   end
+
+  def from_header(name, type, id, digest)
+    if domain = APP_CONFIG['messages_domain']
+      from quote_address_if_necessary("#{name} <#{type}-#{id}-#{digest[0,6]}@#{domain}>", "utf-8")
+    end
+  end
 end