X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1f7bd08f4a8a6a626a0c1d7ed60f2dcd6a6801e8..460a8a106b488900fc79d75d92e265f1f22cd827:/app/models/notifier.rb diff --git a/app/models/notifier.rb b/app/models/notifier.rb index b1a94a77d..8f9e3e295 100644 --- a/app/models/notifier.rb +++ b/app/models/notifier.rb @@ -3,6 +3,8 @@ 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 @@ -12,7 +14,7 @@ class Notifier < ActionMailer::Base :confirm_string => token.token) mail :to => user.email, - :subject => I18n.t('notifier.signup_confirm.subject') + :subject => I18n.t("notifier.signup_confirm.subject") end end @@ -24,7 +26,7 @@ class Notifier < ActionMailer::Base :confirm_string => token.token) mail :to => user.new_email, - :subject => I18n.t('notifier.email_confirm.subject') + :subject => I18n.t("notifier.email_confirm.subject") end end @@ -35,7 +37,7 @@ class Notifier < ActionMailer::Base :token => token.token) mail :to => user.email, - :subject => I18n.t('notifier.lost_password.subject') + :subject => I18n.t("notifier.lost_password.subject") end end @@ -48,7 +50,7 @@ class Notifier < ActionMailer::Base @possible_points = possible_points mail :to => trace.user.email, - :subject => I18n.t('notifier.gpx_notification.success.subject') + :subject => I18n.t("notifier.gpx_notification.success.subject") end end @@ -60,7 +62,7 @@ class Notifier < ActionMailer::Base @error = error mail :to => trace.user.email, - :subject => I18n.t('notifier.gpx_notification.failure.subject') + :subject => I18n.t("notifier.gpx_notification.failure.subject") end end @@ -76,16 +78,19 @@ class Notifier < ActionMailer::Base @replyurl = url_for(:host => SERVER_URL, :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, - :subject => I18n.t('notifier.message_notification.subject_header', :subject => message.title) + :subject => I18n.t("notifier.message_notification.subject_header", :subject => message.title) 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 @@ -106,19 +111,30 @@ class Notifier < ActionMailer::Base :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, - :subject => I18n.t('notifier.diary_comment_notification.subject', :user => comment.user.display_name) + 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 def friend_notification(friend) with_recipient_locale friend.befriendee do @friend = friend - + @viewurl = url_for(:host => SERVER_URL, + :controller => "user", :action => "view", + :display_name => @friend.befriender.display_name) + @friendurl = url_for(:host => SERVER_URL, + :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) + :subject => I18n.t("notifier.friend_notification.subject", :user => friend.befriender.display_name) end end @@ -130,17 +146,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,41 +167,64 @@ 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 @commenter = comment.author.display_name - @changeset_comment = comment.changeset.tags['comment'].presence + @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 end -private + 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) - if Object.const_defined?(:MESSAGES_DOMAIN) and domain = MESSAGES_DOMAIN - "#{name} <#{type}-#{id}-#{digest[0,6]}@#{domain}>" + def from_address(name, type, id, digest, user_id = nil) + if Object.const_defined?(:MESSAGES_DOMAIN) && domain = MESSAGES_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