Update bundle

[rails.git] / app / mailers / notifier.rb

diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb
index 6e0c81a39177337b6f6ad57ddeb6b2d11e36644a..c60dff84b9f0265cfc66137cb5cac3271529e324 100644 (file)
--- a/app/mailers/notifier.rb
+++ b/app/mailers/notifier.rb
@@ -1,4 +1,4 @@
-class Notifier < ActionMailer::Base
+class Notifier < ApplicationMailer

   include ActionView::Helpers::AssetUrlHelper
 
   self.delivery_job = ActionMailer::MailDeliveryJob
   include ActionView::Helpers::AssetUrlHelper
 
   self.delivery_job = ActionMailer::MailDeliveryJob


@@ -94,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}" })
       @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)
 
       @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)
       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)


@@ -136,6 +137,8 @@ class Notifier < ActionMailer::Base
       @author = @commenter
       attach_user_avatar(comment.author)
 
       @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
       subject = if @owner
                   I18n.t("notifier.note_comment_notification.#{@event}.subject_own", :commenter => @commenter)
                 else


@@ -166,6 +169,8 @@ class Notifier < ActionMailer::Base
 
       attach_user_avatar(comment.author)
 
 
       attach_user_avatar(comment.author)
 

+      set_references("changeset", comment.changeset)
+

       mail :to => recipient.email, :subject => subject
     end
   end
       mail :to => recipient.email, :subject => subject
     end
   end


@@ -177,7 +182,7 @@ class Notifier < ActionMailer::Base
   end
 
   def attach_project_logo
   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)
   end
 
   def attach_user_avatar(user)


@@ -187,9 +192,9 @@ class Notifier < ActionMailer::Base
   def user_avatar_file(user)
     avatar = user&.avatar
     if avatar&.attached?
   def user_avatar_file(user)
     avatar = user&.avatar
     if avatar&.attached?

-      return avatar.variant(:resize => "50x50>").blob.download
+      avatar.variant(:resize => "50x50>").blob.download

     else
     else

-      return File.read(Rails.root.join("app", "assets", "images", "avatar_small.png"))
+      File.read(Rails.root.join("app/assets/images/avatar_small.png"))

     end
   end
 
     end
   end
 


@@ -210,4 +215,12 @@ class Notifier < ActionMailer::Base
       Settings.email_from
     end
   end
       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
 end