X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/78ef65aff71b8e7c000179f1d561dcc1e10b6d84..877724813ce3b9bc8b3a33a1544bdc4e27d2f2af:/app/models/notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index af66cd7f9..e471730c1 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -39,15 +39,24 @@ class Notifier < ActionMailer::Base
   end
   
   def message_notification(message)
-    @from_user = User.find(message.from_user_id)
-    @to_user = User.find(message.to_user_id)
-    @recipients = @to_user.email
+    @recipients = message.recipient.email
     @from = 'abuse@openstreetmap.org'
-    @subject = "[OpenStreetMap] #{@from_user.display_name} sent you a new message"
-    @body['to_user'] = @to_user.display_name
-    @body['from_user'] = @from_user.display_name
+    @subject = "[OpenStreetMap] #{message.sender.display_name} sent you a new message"
+    @body['to_user'] = message.recipient.display_name
+    @body['from_user'] = message.sender.display_name
     @body['body'] = message.body
     @body['subject'] = message.title
-    @body['url'] = "http://#{SERVER_URL}/message/read/#{message.id}"
+    @body['readurl'] = "http://#{SERVER_URL}/message/read/#{message.id}"
+    @body['replyurl'] = "http://#{SERVER_URL}/message/new/#{message.from_user_id}"
+  end
+
+  def friend_notification(friend)
+    @friend = User.find_by_id(friend.user_id)
+    @new_friend = User.find_by_id(friend.friend_user_id)
+    @recipients = @new_friend.email
+    @from = 'abuse@openstreetmap.org'
+    @subject = "[OpenStreetMap] #{@friend.display_name} added you as a friend"
+    @body['user'] = @friend.display_name
+    @body['userurl'] = "http://#{SERVER_URL}/user/#{@friend.display_name}"
   end
 end