X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dc2a2c8ebd1a11e4a64555fda22c6859a51defff..736ff9b1a0fd251778c06e785a78ceebac960190:/app/models/notifier.rb?ds=sidebyside diff --git a/app/models/notifier.rb b/app/models/notifier.rb index bc018cbe8..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 @@ -116,7 +132,17 @@ class Notifier < ActionMailer::Base def friend_notification(friend) 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 @@ -130,17 +156,20 @@ class Notifier < ActionMailer::Base @owner = recipient == comment.note.author @event = comment.event - if comment.author - @commenter = comment.author.display_name - else - @commenter = I18n.t("notifier.note_comment_notification.anonymous") - end + @commenter = if comment.author + comment.author.display_name + else + I18n.t("notifier.note_comment_notification.anonymous") + end - if @owner - subject = I18n.t("notifier.note_comment_notification.#{@event}.subject_own", :commenter => @commenter) - else - subject = I18n.t("notifier.note_comment_notification.#{@event}.subject_other", :commenter => @commenter) - end + @author = @commenter + attach_user_avatar(comment.author) + + subject = if @owner + I18n.t("notifier.note_comment_notification.#{@event}.subject_own", :commenter => @commenter) + else + I18n.t("notifier.note_comment_notification.#{@event}.subject_other", :commenter => @commenter) + end mail :to => recipient.email, :subject => subject end @@ -148,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 @@ -155,12 +185,15 @@ class Notifier < ActionMailer::Base @changeset_comment = comment.changeset.tags["comment"].presence @time = comment.created_at @changeset_author = comment.changeset.user.display_name + @author = @commenter - if @owner - subject = I18n.t("notifier.changeset_comment_notification.commented.subject_own", :commenter => @commenter) - else - subject = I18n.t("notifier.changeset_comment_notification.commented.subject_other", :commenter => @commenter) - end + subject = if @owner + I18n.t("notifier.changeset_comment_notification.commented.subject_own", :commenter => @commenter) + else + I18n.t("notifier.changeset_comment_notification.commented.subject_other", :commenter => @commenter) + end + + attach_user_avatar(comment.author) mail :to => recipient.email, :subject => subject end @@ -168,21 +201,40 @@ class Notifier < ActionMailer::Base private - def with_recipient_locale(recipient) - old_locale = I18n.locale + 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 - begin - I18n.locale = recipient.preferred_language_from(I18n.available_locales) + 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 - ensure - I18n.locale = old_locale 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