X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/479a4bd0d7f9e3ece258634475fdc47f863c5c19..417176f8685ae60b670e609ca4d7e2e7c5c07647:/app/models/notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 60b682693..ee40a0d6e 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -3,6 +3,7 @@ class Notifier < ActionMailer::Base
           :return_path => EMAIL_RETURN_PATH,
           :auto_submitted => "auto-generated"
   helper :application
+  before_action :set_shared_template_vars
 
   def signup_confirm(user, token)
     with_recipient_locale user do
@@ -106,6 +107,9 @@ class Notifier < ActionMailer::Base
                           :action => "new",
                           :display_name => comment.user.display_name,
                           :title => "Re: #{comment.diary_entry.title}")
+      @user_message_author = @from_user
+
+      attach_user_avatar(comment.user)
 
       mail :from => from_address(comment.user.display_name, "c", comment.id, comment.digest, recipient.id),
            :to => recipient.email,
@@ -154,7 +158,6 @@ class Notifier < ActionMailer::Base
 
   def changeset_comment_notification(comment, recipient)
     with_recipient_locale recipient do
-      @root_url = root_url(:host => SERVER_URL)
       @changeset_url = changeset_url(comment.changeset, :host => SERVER_URL)
       @comment = comment.body
       @owner = recipient == comment.changeset.user
@@ -162,6 +165,7 @@ class Notifier < ActionMailer::Base
       @changeset_comment = comment.changeset.tags["comment"].presence
       @time = comment.created_at
       @changeset_author = comment.changeset.user.display_name
+      @user_message_author = @commenter
 
       subject = if @owner
                   I18n.t("notifier.changeset_comment_notification.commented.subject_own", :commenter => @commenter)
@@ -169,8 +173,8 @@ class Notifier < ActionMailer::Base
                   I18n.t("notifier.changeset_comment_notification.commented.subject_other", :commenter => @commenter)
                 end
 
-      attachments.inline["logo.png"] = File.read("#{Rails.root}/app/assets/images/osm_logo_30.png")
-      attachments.inline["avatar.png"] = File.read(user_avatar_file_path(comment.author))
+      attach_project_logo
+      attach_user_avatar(comment.author)
 
       mail :to => recipient.email, :subject => subject
     end
@@ -178,6 +182,19 @@ class Notifier < ActionMailer::Base
 
   private
 
+  def set_shared_template_vars
+    @root_url = root_url(:host => SERVER_URL)
+    attach_project_logo
+  end
+
+  def attach_project_logo
+    attachments.inline["logo.png"] = File.read("#{Rails.root}/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.image
     if image.file?