Update to iD v2.9.2

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

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 40a516a927a388d81d91b0bd8a0012a6102e2def..d08bedd8ca05a5c9f9d162a942248499a1b711bf 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -3,11 +3,12 @@ class Notifier < ActionMailer::Base
           :return_path => EMAIL_RETURN_PATH,
           :auto_submitted => "auto-generated"
   helper :application
           :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
 
   def signup_confirm(user, token)
     with_recipient_locale user do

-      @url = url_for(:host => SERVER_URL,
-                     :controller => "user", :action => "confirm",
+      @url = url_for(:controller => "user", :action => "confirm",

                      :display_name => user.display_name,
                      :confirm_string => token.token)
 
                      :display_name => user.display_name,
                      :confirm_string => token.token)
 


@@ -19,8 +20,7 @@ class Notifier < ActionMailer::Base
   def email_confirm(user, token)
     with_recipient_locale user do
       @address = user.new_email
   def email_confirm(user, token)
     with_recipient_locale user do
       @address = user.new_email

-      @url = url_for(:host => SERVER_URL,
-                     :controller => "user", :action => "confirm_email",
+      @url = url_for(:controller => "user", :action => "confirm_email",

                      :confirm_string => token.token)
 
       mail :to => user.new_email,
                      :confirm_string => token.token)
 
       mail :to => user.new_email,


@@ -30,8 +30,7 @@ class Notifier < ActionMailer::Base
 
   def lost_password(user, token)
     with_recipient_locale user do
 
   def lost_password(user, token)
     with_recipient_locale user do

-      @url = url_for(:host => SERVER_URL,
-                     :controller => "user", :action => "reset_password",
+      @url = url_for(:controller => "user", :action => "reset_password",

                      :token => token.token)
 
       mail :to => user.email,
                      :token => token.token)
 
       mail :to => user.email,


@@ -70,12 +69,11 @@ class Notifier < ActionMailer::Base
       @from_user = message.sender.display_name
       @text = message.body
       @title = message.title
       @from_user = message.sender.display_name
       @text = message.body
       @title = message.title

-      @readurl = url_for(:host => SERVER_URL,
-                         :controller => "message", :action => "read",
-                         :message_id => message.id)
-      @replyurl = url_for(:host => SERVER_URL,
-                          :controller => "message", :action => "reply",
-                          :message_id => message.id)
+      @readurl = message_url(message)
+      @replyurl = reply_message_url(message)
+      @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,
 
       mail :from => from_address(message.sender.display_name, "m", message.id, message.digest),
            :to => message.recipient.email,


@@ -89,23 +87,21 @@ class Notifier < ActionMailer::Base
       @from_user = comment.user.display_name
       @text = comment.body
       @title = comment.diary_entry.title
       @from_user = comment.user.display_name
       @text = comment.body
       @title = comment.diary_entry.title

-      @readurl = url_for(:host => SERVER_URL,
-                         :controller => "diary_entry",
+      @readurl = url_for(:controller => "diary_entry",

                          :action => "view",
                          :display_name => comment.diary_entry.user.display_name,
                          :id => comment.diary_entry.id,
                          :anchor => "comment#{comment.id}")
                          :action => "view",
                          :display_name => comment.diary_entry.user.display_name,
                          :id => comment.diary_entry.id,
                          :anchor => "comment#{comment.id}")

-      @commenturl = url_for(:host => SERVER_URL,
-                            :controller => "diary_entry",
+      @commenturl = url_for(:controller => "diary_entry",

                             :action => "view",
                             :display_name => comment.diary_entry.user.display_name,
                             :id => comment.diary_entry.id,
                             :anchor => "newcomment")
                             :action => "view",
                             :display_name => comment.diary_entry.user.display_name,
                             :id => comment.diary_entry.id,
                             :anchor => "newcomment")

-      @replyurl = url_for(:host => SERVER_URL,
-                          :controller => "message",
-                          :action => "new",
-                          :display_name => comment.user.display_name,
-                          :title => "Re: #{comment.diary_entry.title}")
+      @replyurl = new_message_url(comment.user, :message => { :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, recipient.id),
            :to => recipient.email,
 
       mail :from => from_address(comment.user.display_name, "c", comment.id, comment.digest, recipient.id),
            :to => recipient.email,


@@ -116,13 +112,13 @@ class Notifier < ActionMailer::Base
   def friend_notification(friend)
     with_recipient_locale friend.befriendee do
       @friend = friend
   def friend_notification(friend)
     with_recipient_locale friend.befriendee do
       @friend = friend

-      @viewurl = url_for(:host => SERVER_URL,
-                         :controller => "user", :action => "view",
+      @viewurl = url_for(:controller => "user", :action => "view",

                          :display_name => @friend.befriender.display_name)
                          :display_name => @friend.befriender.display_name)

-      @friendurl = url_for(:host => SERVER_URL,
-                           :controller => "user", :action => "make_friend",
+      @friendurl = url_for(:controller => "user", :action => "make_friend",

                            :display_name => @friend.befriender.display_name)
                            :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)
     end
       mail :to => friend.befriendee.email,
            :subject => I18n.t("notifier.friend_notification.subject", :user => friend.befriender.display_name)
     end


@@ -130,7 +126,7 @@ class Notifier < ActionMailer::Base
 
   def note_comment_notification(comment, recipient)
     with_recipient_locale recipient do
 
   def note_comment_notification(comment, recipient)
     with_recipient_locale recipient do

-      @noteurl = browse_note_url(comment.note, :host => SERVER_URL)
+      @noteurl = browse_note_url(comment.note)

       @place = Nominatim.describe_location(comment.note.lat, comment.note.lon, 14, I18n.locale)
       @comment = comment.body
       @owner = recipient == comment.note.author
       @place = Nominatim.describe_location(comment.note.lat, comment.note.lon, 14, I18n.locale)
       @comment = comment.body
       @owner = recipient == comment.note.author


@@ -142,6 +138,9 @@ class Notifier < ActionMailer::Base
                      I18n.t("notifier.note_comment_notification.anonymous")
                    end
 
                      I18n.t("notifier.note_comment_notification.anonymous")
                    end
 

+      @author = @commenter
+      attach_user_avatar(comment.author)
+

       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


@@ -154,15 +153,15 @@ class Notifier < ActionMailer::Base
 
   def changeset_comment_notification(comment, recipient)
     with_recipient_locale recipient do
 
   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)
+      @to_user = recipient.display_name
+      @changeset_url = changeset_url(comment.changeset)

       @comment = comment.body
       @owner = recipient == comment.changeset.user
       @commenter = comment.author.display_name
       @comment = comment.body
       @owner = recipient == comment.changeset.user
       @commenter = comment.author.display_name

-      @commenter_url = user_url(comment.author.display_name, :host => SERVER_URL)

       @changeset_comment = comment.changeset.tags["comment"].presence
       @time = comment.created_at
       @changeset_author = comment.changeset.user.display_name
       @changeset_comment = comment.changeset.tags["comment"].presence
       @time = comment.created_at
       @changeset_author = comment.changeset.user.display_name

+      @author = @commenter

 
       subject = if @owner
                   I18n.t("notifier.changeset_comment_notification.commented.subject_own", :commenter => @commenter)
 
       subject = if @owner
                   I18n.t("notifier.changeset_comment_notification.commented.subject_own", :commenter => @commenter)


@@ -170,8 +169,7 @@ class Notifier < ActionMailer::Base
                   I18n.t("notifier.changeset_comment_notification.commented.subject_other", :commenter => @commenter)
                 end
 
                   I18n.t("notifier.changeset_comment_notification.commented.subject_other", :commenter => @commenter)
                 end
 

-      attachments.inline["logo.png"] = File.read(Rails.root.join("app", "assets", "images", "osm_logo_30.png"))
-      attachments.inline["avatar.png"] = File.read(user_avatar_file_path(comment.author))
+      attach_user_avatar(comment.author)

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


@@ -179,9 +177,21 @@ class Notifier < ActionMailer::Base
 
   private
 
 
   private
 

+  def set_shared_template_vars
+    @root_url = root_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
+

   def user_avatar_file_path(user)
   def user_avatar_file_path(user)

-    image = user.image
-    if image.file?
+    image = user && user.image
+    if image && image.file?

       return image.path(:small)
     else
       return Rails.root.join("app", "assets", "images", "users", "images", "small.png")
       return image.path(:small)
     else
       return Rails.root.join("app", "assets", "images", "users", "images", "small.png")