X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/453f758f91d57688663e354a54061a65945410e7..f227804093a5a82eaf724f9b028b25aa7cbf41a1:/app/models/notifier.rb diff --git a/app/models/notifier.rb b/app/models/notifier.rb index 13751560f..36564f614 100644 --- a/app/models/notifier.rb +++ b/app/models/notifier.rb @@ -3,10 +3,13 @@ class Notifier < ActionMailer::Base :return_path => EMAIL_RETURN_PATH, :auto_submitted => "auto-generated" helper :application + before_action :set_shared_template_vars + before_action :attach_project_logo def signup_confirm(user, token) with_recipient_locale user do @url = url_for(:host => SERVER_URL, + :protocol => SERVER_PROTOCOL, :controller => "user", :action => "confirm", :display_name => user.display_name, :confirm_string => token.token) @@ -20,6 +23,7 @@ class Notifier < ActionMailer::Base with_recipient_locale user do @address = user.new_email @url = url_for(:host => SERVER_URL, + :protocol => SERVER_PROTOCOL, :controller => "user", :action => "confirm_email", :confirm_string => token.token) @@ -31,6 +35,7 @@ class Notifier < ActionMailer::Base def lost_password(user, token) with_recipient_locale user do @url = url_for(:host => SERVER_URL, + :protocol => SERVER_PROTOCOL, :controller => "user", :action => "reset_password", :token => token.token) @@ -71,11 +76,16 @@ class Notifier < ActionMailer::Base @text = message.body @title = message.title @readurl = url_for(:host => SERVER_URL, + :protocol => SERVER_PROTOCOL, :controller => "message", :action => "read", :message_id => message.id) @replyurl = url_for(:host => SERVER_URL, + :protocol => SERVER_PROTOCOL, :controller => "message", :action => "reply", :message_id => message.id) + @author = @from_user + + attach_user_avatar(message.sender) mail :from => from_address(message.sender.display_name, "m", message.id, message.digest), :to => message.recipient.email, @@ -83,32 +93,38 @@ class Notifier < ActionMailer::Base end end - def diary_comment_notification(comment) - with_recipient_locale comment.diary_entry.user do - @to_user = comment.diary_entry.user.display_name + def diary_comment_notification(comment, recipient) + with_recipient_locale recipient do + @to_user = recipient.display_name @from_user = comment.user.display_name @text = comment.body @title = comment.diary_entry.title @readurl = url_for(:host => SERVER_URL, + :protocol => SERVER_PROTOCOL, :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, + :protocol => SERVER_PROTOCOL, :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, + :protocol => SERVER_PROTOCOL, :controller => "message", :action => "new", :display_name => comment.user.display_name, :title => "Re: #{comment.diary_entry.title}") + @author = @from_user + + attach_user_avatar(comment.user) - mail :from => from_address(comment.user.display_name, "c", comment.id, comment.digest), - :to => comment.diary_entry.user.email, + mail :from => from_address(comment.user.display_name, "c", comment.id, comment.digest, recipient.id), + :to => recipient.email, :subject => I18n.t("notifier.diary_comment_notification.subject", :user => comment.user.display_name) end end @@ -117,12 +133,16 @@ class Notifier < ActionMailer::Base with_recipient_locale friend.befriendee do @friend = friend @viewurl = url_for(:host => SERVER_URL, + :protocol => SERVER_PROTOCOL, :controller => "user", :action => "view", :display_name => @friend.befriender.display_name) @friendurl = url_for(:host => SERVER_URL, + :protocol => SERVER_PROTOCOL, :controller => "user", :action => "make_friend", :display_name => @friend.befriender.display_name) + @author = @friend.befriender.display_name + attach_user_avatar(@friend.befriender) mail :to => friend.befriendee.email, :subject => I18n.t("notifier.friend_notification.subject", :user => friend.befriender.display_name) end @@ -142,6 +162,9 @@ class Notifier < ActionMailer::Base I18n.t("notifier.note_comment_notification.anonymous") end + @author = @commenter + attach_user_avatar(comment.author) + subject = if @owner I18n.t("notifier.note_comment_notification.#{@event}.subject_own", :commenter => @commenter) else @@ -154,6 +177,7 @@ class Notifier < ActionMailer::Base def changeset_comment_notification(comment, recipient) with_recipient_locale recipient do + @to_user = recipient.display_name @changeset_url = changeset_url(comment.changeset, :host => SERVER_URL) @comment = comment.body @owner = recipient == comment.changeset.user @@ -161,6 +185,7 @@ class Notifier < ActionMailer::Base @changeset_comment = comment.changeset.tags["comment"].presence @time = comment.created_at @changeset_author = comment.changeset.user.display_name + @author = @commenter subject = if @owner I18n.t("notifier.changeset_comment_notification.commented.subject_own", :commenter => @commenter) @@ -168,31 +193,50 @@ class Notifier < ActionMailer::Base I18n.t("notifier.changeset_comment_notification.commented.subject_other", :commenter => @commenter) end - mail :to => recipient.email, :subject => subject - end - end + attach_user_avatar(comment.author) - def new_issue_notification(recipient) - with_recipient_locale recipient do - subject = I18n.t("notifier.new_issue_notification.subject") mail :to => recipient.email, :subject => subject end end private + def set_shared_template_vars + @root_url = root_url(:host => SERVER_URL) + end + + def attach_project_logo + attachments.inline["logo.png"] = File.read(Rails.root.join("app", "assets", "images", "osm_logo_30.png")) + end + + def attach_user_avatar(user) + attachments.inline["avatar.png"] = File.read(user_avatar_file_path(user)) + end + + def user_avatar_file_path(user) + image = user && user.image + if image && image.file? + return image.path(:small) + else + return Rails.root.join("app", "assets", "images", "users", "images", "small.png") + end + end + def with_recipient_locale(recipient) I18n.with_locale Locale.available.preferred(recipient.preferred_languages) do yield end end - def from_address(name, type, id, digest) + def from_address(name, type, id, digest, user_id = nil) if Object.const_defined?(:MESSAGES_DOMAIN) && domain = MESSAGES_DOMAIN - "#{name} <#{type}-#{id}-#{digest[0, 6]}@#{domain}>" + if user_id + "#{name} <#{type}-#{id}-#{user_id}-#{digest[0, 6]}@#{domain}>" + else + "#{name} <#{type}-#{id}-#{digest[0, 6]}@#{domain}>" + end else EMAIL_FROM end end - end