Don't preload nodes as it seem to break ways with duplicate nodes.

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

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 00bec921c022d02f9b9e3cd6e54669266375b585..f934a8bde42a6a95939fd81c7ea2495cb8018f42 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -1,52 +1,79 @@
 class Notifier < ActionMailer::Base
 class Notifier < ActionMailer::Base

-
-  def signup_confirm( user, token )
-    @recipients = user.email
-    @from = 'abuse@openstreetmap.org'
-    @subject = '[OpenStreetMap] Confirm your email address'
-    @body['url'] = "http://#{SERVER_URL}/user/confirm?confirm_string=#{token.token}"
+  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)

   end
 
   end
 

-  def lost_password( user, token )
-    @recipients = user.email
-    @from = 'abuse@openstreetmap.org'
-    @subject = '[OpenStreetMap] Password reset request'
-    @body['url'] = "http://#{SERVER_URL}/user/reset_password?email=#{user.email}&token=#{token.token}"
+  def lost_password(user, token)
+    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)

   end
 
   def reset_password(user, pass)
   end
 
   def reset_password(user, pass)

-    @recipients = user.email
-    @from = 'abuse@openstreetmap.org'
-    @subject = '[OpenStreetMap] Password reset'
-    @body['pass'] = pass
+    recipients user.email
+    from "webmaster@openstreetmap.org"
+    subject "[OpenStreetMap] Password reset"
+    headers "Auto-Submitted" => "auto-generated"
+    body :pass => pass

   end
 
   def gpx_success(trace, possible_points)
   end
 
   def gpx_success(trace, possible_points)

-    @recipients = trace.user.email
-    @from = 'abuse@openstreetmap.org'
-    @subject = '[OpenStreetMap] GPX Import success'
-    @body['trace_name'] = trace.name
-    @body['trace_points'] = trace.size
-    @body['possible_points'] = possible_points
+    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

   end
 
   def gpx_failure(trace, error)
   end
 
   def gpx_failure(trace, error)

-    @recipients = trace.user.email
-    @from = 'abuse@openstreetmap.org'
-    @subject = '[OpenStreetMap] GPX Import failure'
-    @body['trace_name'] = trace.name
-    @body['error'] = error
+    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
   
   def message_notification(message)
   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
-    @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
-    @body['subject'] = message.title
-    @body['url'] = "http://#{SERVER_URL}/message/read/#{message.id}"
+    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,
+         :subject => message.title,
+         :readurl => url_for(:host => SERVER_URL,
+                             :controller => "message", :action => "read",
+                             :message_id => message.id),
+         :replyurl => url_for(:host => SERVER_URL,
+                              :controller => "message", :action => "reply",
+                              :message_id => message.id)
+  end
+
+  def friend_notification(friend)
+    befriender = User.find_by_id(friend.user_id)
+    befriendee = User.find_by_id(friend.friend_user_id)
+
+    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",
+                             :display_name => befriender.display_name)

   end
 end
   end
 end