Merge remote-tracking branch 'upstream/pull/2695'

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

diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb
index 676ae6f3b5cf56f19bc305718d3995161963e340..3c794cca92f45d376c95ebe4945b150fd713aa22 100644 (file)
--- a/app/mailers/notifier.rb
+++ b/app/mailers/notifier.rb
@@ -94,13 +94,11 @@ class Notifier < ApplicationMailer
       @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}" })
-      @ref = "osm-diary-#{comment.diary_entry.id}@#{Settings.server_url}"
       @author = @from_user
 
       attach_user_avatar(comment.user)
 
-      headers["In-Reply-To"] = @ref
-      headers["References"]  = @ref
+      set_references("diary", comment.diary_entry)
 
       mail :from => from_address(comment.user.display_name, "c", comment.id, comment.digest, recipient.id),
            :to => recipient.email,
@@ -108,17 +106,16 @@ class Notifier < ApplicationMailer
     end
   end
 
-  def friend_notification(friend)
-    with_recipient_locale friend.befriendee do
-      @friend = friend
-      @viewurl = user_url(@friend.befriender)
-      @friendurl = url_for(:controller => "users", :action => "make_friend",
-                           :display_name => @friend.befriender.display_name)
-      @author = @friend.befriender.display_name
+  def friendship_notification(friendship)
+    with_recipient_locale friendship.befriendee do
+      @friendship = friendship
+      @viewurl = user_url(@friendship.befriender)
+      @friendurl = make_friend_url(@friendship.befriender)
+      @author = @friendship.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)
+      attach_user_avatar(@friendship.befriender)
+      mail :to => friendship.befriendee.email,
+           :subject => I18n.t("notifier.friendship_notification.subject", :user => friendship.befriender.display_name)
     end
   end
 
@@ -129,7 +126,6 @@ class Notifier < ApplicationMailer
       @comment = comment.body
       @owner = recipient == comment.note.author
       @event = comment.event
-      @ref = "osm-note-#{comment.note.id}@#{Settings.server_url}"
 
       @commenter = if comment.author
                      comment.author.display_name
@@ -140,8 +136,7 @@ class Notifier < ApplicationMailer
       @author = @commenter
       attach_user_avatar(comment.author)
 
-      headers["In-Reply-To"] = @ref
-      headers["References"]  = @ref
+      set_references("note", comment.note)
 
       subject = if @owner
                   I18n.t("notifier.note_comment_notification.#{@event}.subject_own", :commenter => @commenter)
@@ -164,7 +159,6 @@ class Notifier < ApplicationMailer
       @time = comment.created_at
       @changeset_author = comment.changeset.user.display_name
       @author = @commenter
-      @ref = "osm-changeset-#{comment.changeset.id}@#{Settings.server_url}"
 
       subject = if @owner
                   I18n.t("notifier.changeset_comment_notification.commented.subject_own", :commenter => @commenter)
@@ -174,8 +168,7 @@ class Notifier < ApplicationMailer
 
       attach_user_avatar(comment.author)
 
-      headers["In-Reply-To"] = @ref
-      headers["References"]  = @ref
+      set_references("changeset", comment.changeset)
 
       mail :to => recipient.email, :subject => subject
     end
@@ -198,7 +191,12 @@ class Notifier < ApplicationMailer
   def user_avatar_file(user)
     avatar = user&.avatar
     if avatar&.attached?
-      avatar.variant(:resize => "50x50>").blob.download
+      if avatar.variable?
+        image = avatar.variant(:resize => "50x50>").processed
+        image.service.download(image.key)
+      else
+        avatar.blob.download
+      end
     else
       File.read(Rails.root.join("app/assets/images/avatar_small.png"))
     end
@@ -221,4 +219,12 @@ class Notifier < ApplicationMailer
       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