Tidy up mail notifiers and make them more rails style rather then

relying on ActionMailer implementation details.
This commit is contained in:
Tom Hughes 2007-10-30 00:48:45 +00:00
parent c3424e9cfb
commit 3aa8ffbcb8

View file

@ -1,62 +1,72 @@
class Notifier < ActionMailer::Base class Notifier < ActionMailer::Base
def signup_confirm(user, token)
def signup_confirm( user, token ) recipients user.email
@recipients = user.email from "webmaster@openstreetmap.org"
@from = 'abuse@openstreetmap.org' subject "[OpenStreetMap] Confirm your email address"
@subject = '[OpenStreetMap] Confirm your email address' body :url => url_for(:host => SERVER_URL,
@body['url'] = "http://#{SERVER_URL}/user/confirm?confirm_string=#{token.token}" :controller => "user", :action => "confirm",
:confirm_string => token.token)
end end
def lost_password( user, token ) def lost_password(user, token)
@recipients = user.email recipients user.email
@from = 'abuse@openstreetmap.org' from "webmaster@openstreetmap.org"
@subject = '[OpenStreetMap] Password reset request' subject "[OpenStreetMap] Password reset request"
@body['url'] = "http://#{SERVER_URL}/user/reset_password?email=#{user.email}&token=#{token.token}" body :url => url_for(:host => SERVER_URL,
:controller => "user", :action => "reset_password",
:email => user.email, :token => token.token)
end end
def reset_password(user, pass) def reset_password(user, pass)
@recipients = user.email recipients user.email
@from = 'abuse@openstreetmap.org' from "webmaster@openstreetmap.org"
@subject = '[OpenStreetMap] Password reset' subject "[OpenStreetMap] Password reset"
@body['pass'] = pass body :pass => pass
end end
def gpx_success(trace, possible_points) def gpx_success(trace, possible_points)
@recipients = trace.user.email recipients trace.user.email
@from = 'abuse@openstreetmap.org' from "webmaster@openstreetmap.org"
@subject = '[OpenStreetMap] GPX Import success' subject "[OpenStreetMap] GPX Import success"
@body['trace_name'] = trace.name body :trace_name => trace.name,
@body['trace_points'] = trace.size :trace_points => trace.size,
@body['possible_points'] = possible_points :possible_points => possible_points
end end
def gpx_failure(trace, error) def gpx_failure(trace, error)
@recipients = trace.user.email recipients trace.user.email
@from = 'abuse@openstreetmap.org' from "webmaster@openstreetmap.org"
@subject = '[OpenStreetMap] GPX Import failure' subject "[OpenStreetMap] GPX Import failure"
@body['trace_name'] = trace.name body :trace_name => trace.name,
@body['error'] = error :error => error
end end
def message_notification(message) def message_notification(message)
@recipients = message.recipient.email recipients message.recipient.email
@from = 'abuse@openstreetmap.org' from "webmaster@openstreetmap.org"
@subject = "[OpenStreetMap] #{message.sender.display_name} sent you a new message" subject "[OpenStreetMap] #{message.sender.display_name} sent you a new message"
@body['to_user'] = message.recipient.display_name body :to_user => message.recipient.display_name,
@body['from_user'] = message.sender.display_name :from_user => message.sender.display_name,
@body['body'] = message.body :body => message.body,
@body['subject'] = message.title :subject => message.title,
@body['readurl'] = "http://#{SERVER_URL}/message/read/#{message.id}" :readurl => url_for(:host => SERVER_URL,
@body['replyurl'] = "http://#{SERVER_URL}/message/new/#{message.from_user_id}" :controller => "message", :action => "read",
:message_id => message.id),
:replyurl => url_for(:host => SERVER_URL,
:controller => "message", :action => "new",
:user_id => message.from_user_id)
end end
def friend_notification(friend) def friend_notification(friend)
@friend = User.find_by_id(friend.user_id) befriender = User.find_by_id(friend.user_id)
@new_friend = User.find_by_id(friend.friend_user_id) befriendee = User.find_by_id(friend.friend_user_id)
@recipients = @new_friend.email
@from = 'abuse@openstreetmap.org' recipients befriendee.email
@subject = "[OpenStreetMap] #{@friend.display_name} added you as a friend" from "webmaster@openstreetmap.org"
@body['user'] = @friend.display_name subject "[OpenStreetMap] #{befriender.display_name} added you as a friend"
@body['userurl'] = "http://#{SERVER_URL}/user/#{@friend.display_name}" body :user => befriender.display_name,
:userurl => url_for(:host => SERVER_URL,
:controller => "user", :action => "view",
:display_name => befriender.display_name)
end end
end end