X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e3ed9988ce5f57ed303326072f7f583b641e8774..bf9dd8f350ca1b54afb79dda79506d980ccb5738:/app/mailers/notifier.rb diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb index e705efb00..c60dff84b 100644 --- a/app/mailers/notifier.rb +++ b/app/mailers/notifier.rb @@ -1,4 +1,8 @@ -class Notifier < ActionMailer::Base +class Notifier < ApplicationMailer + include ActionView::Helpers::AssetUrlHelper + + self.delivery_job = ActionMailer::MailDeliveryJob + default :from => Settings.email_from, :return_path => Settings.email_return_path, :auto_submitted => "auto-generated" @@ -90,11 +94,12 @@ class Notifier < ActionMailer::Base @readurl = diary_entry_url(comment.diary_entry.user, comment.diary_entry, :anchor => "comment#{comment.id}") @commenturl = diary_entry_url(comment.diary_entry.user, comment.diary_entry, :anchor => "newcomment") @replyurl = new_message_url(comment.user, :message => { :title => "Re: #{comment.diary_entry.title}" }) - @author = @from_user attach_user_avatar(comment.user) + set_references("diary", comment.diary_entry) + 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) @@ -132,6 +137,8 @@ class Notifier < ActionMailer::Base @author = @commenter attach_user_avatar(comment.author) + set_references("note", comment.note) + subject = if @owner I18n.t("notifier.note_comment_notification.#{@event}.subject_own", :commenter => @commenter) else @@ -162,6 +169,8 @@ class Notifier < ActionMailer::Base attach_user_avatar(comment.author) + set_references("changeset", comment.changeset) + mail :to => recipient.email, :subject => subject end end @@ -173,19 +182,19 @@ class Notifier < ActionMailer::Base end def attach_project_logo - attachments.inline["logo.png"] = File.read(Rails.root.join("app", "assets", "images", "osm_logo_30.png")) + 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)) + attachments.inline["avatar.png"] = user_avatar_file(user) end - def user_avatar_file_path(user) - image = user&.image - if image&.file? - return image.path(:small) + def user_avatar_file(user) + avatar = user&.avatar + if avatar&.attached? + avatar.variant(:resize => "50x50>").blob.download else - return Rails.root.join("app", "assets", "images", "users", "images", "small.png") + File.read(Rails.root.join("app/assets/images/avatar_small.png")) end end @@ -206,4 +215,12 @@ class Notifier < ActionMailer::Base Settings.email_from end end + + def set_references(scope, reference_object) + ref = "osm-#{scope}-#{reference_object.id}@#{Settings.server_url}" + + headers["X-Entity-Ref-ID"] = ref + headers["In-Reply-To"] = ref + headers["References"] = ref + end end