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

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

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index be6679c41b74cd6730134e2dc629e19a48efc634..4b61b202c8613e3ec742d8bf8b6d75f4d59e10f5 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -3,39 +3,38 @@ 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)
 
       mail :to => user.email,
                      :display_name => user.display_name,
                      :confirm_string => token.token)
 
       mail :to => user.email,

-           :subject => I18n.t('notifier.signup_confirm.subject')
+           :subject => I18n.t("notifier.signup_confirm.subject")

     end
   end
 
   def email_confirm(user, token)
     with_recipient_locale user do
       @address = user.new_email
     end
   end
 
   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,

-           :subject => I18n.t('notifier.email_confirm.subject')
+           :subject => I18n.t("notifier.email_confirm.subject")

     end
   end
 
   def lost_password(user, token)
     with_recipient_locale user do
     end
   end
 
   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,

-           :subject => I18n.t('notifier.lost_password.subject')
+           :subject => I18n.t("notifier.lost_password.subject")

     end
   end
 
     end
   end
 


@@ -48,7 +47,7 @@ class Notifier < ActionMailer::Base
       @possible_points = possible_points
 
       mail :to => trace.user.email,
       @possible_points = possible_points
 
       mail :to => trace.user.email,

-           :subject => I18n.t('notifier.gpx_notification.success.subject')
+           :subject => I18n.t("notifier.gpx_notification.success.subject")

     end
   end
 
     end
   end
 


@@ -60,7 +59,7 @@ class Notifier < ActionMailer::Base
       @error = error
 
       mail :to => trace.user.email,
       @error = error
 
       mail :to => trace.user.email,

-           :subject => I18n.t('notifier.gpx_notification.failure.subject')
+           :subject => I18n.t("notifier.gpx_notification.failure.subject")

     end
   end
 
     end
   end
 


@@ -70,99 +69,153 @@ 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",
+      @readurl = url_for(:controller => "message", :action => "read",

                          :message_id => message.id)
                          :message_id => message.id)

-      @replyurl = url_for(:host => SERVER_URL,
-                          :controller => "message", :action => "reply",
+      @replyurl = url_for(:controller => "message", :action => "reply",

                           :message_id => message.id)
                           :message_id => message.id)

+      @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,

-           :subject => I18n.t('notifier.message_notification.subject_header', :subject => message.title)
+           :subject => I18n.t("notifier.message_notification.subject_header", :subject => message.title)

     end
   end
 
     end
   end
 

-  def diary_comment_notification(comment)
-    with_recipient_locale comment.diary_entry.user do
-      @to_user = comment.diary_entry.user.display_name
+  def diary_comment_notification(comment, recipient)
+    with_recipient_locale recipient do
+      @to_user = recipient.display_name

       @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",
+      @replyurl = url_for(:controller => "message",

                           :action => "new",
                           :display_name => comment.user.display_name,
                           :title => "Re: #{comment.diary_entry.title}")
 
                           :action => "new",
                           :display_name => comment.user.display_name,
                           :title => "Re: #{comment.diary_entry.title}")
 

-      mail :from => from_address(comment.user.display_name, "c", comment.id, comment.digest),
-           :to =>  comment.diary_entry.user.email,
-           :subject => I18n.t('notifier.diary_comment_notification.subject', :user => comment.user.display_name)
+      @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,
+           :subject => I18n.t("notifier.diary_comment_notification.subject", :user => comment.user.display_name)

     end
   end
 
   def friend_notification(friend)
     with_recipient_locale friend.befriendee do
       @friend = friend
     end
   end
 
   def friend_notification(friend)
     with_recipient_locale friend.befriendee do
       @friend = friend

+      @viewurl = url_for(:controller => "user", :action => "view",
+                         :display_name => @friend.befriender.display_name)
+      @friendurl = url_for(:controller => "user", :action => "make_friend",
+                           :display_name => @friend.befriender.display_name)
+      @author = @friend.befriender.display_name

 
 

+      attach_user_avatar(@friend.befriender)

       mail :to => friend.befriendee.email,
       mail :to => friend.befriendee.email,

-           :subject => I18n.t('notifier.friend_notification.subject', :user => friend.befriender.display_name)
+           :subject => I18n.t("notifier.friend_notification.subject", :user => friend.befriender.display_name)

     end
   end
 
   def note_comment_notification(comment, recipient)
     with_recipient_locale recipient do
     end
   end
 
   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
       @event = comment.event
 
       @place = Nominatim.describe_location(comment.note.lat, comment.note.lon, 14, I18n.locale)
       @comment = comment.body
       @owner = recipient == comment.note.author
       @event = comment.event
 

-      if comment.author
-        @commenter = comment.author.display_name
-      else
-        @commenter = I18n.t("notifier.note_comment_notification.anonymous")
-      end
+      @commenter = if comment.author
+                     comment.author.display_name
+                   else
+                     I18n.t("notifier.note_comment_notification.anonymous")
+                   end

 
 

-      if @owner
-        subject = I18n.t("notifier.note_comment_notification.#{@event}.subject_own", :commenter => @commenter)
-      else
-        subject = I18n.t("notifier.note_comment_notification.#{@event}.subject_other", :commenter => @commenter)
-      end
+      @author = @commenter
+      attach_user_avatar(comment.author)
+
+      subject = if @owner
+                  I18n.t("notifier.note_comment_notification.#{@event}.subject_own", :commenter => @commenter)
+                else
+                  I18n.t("notifier.note_comment_notification.#{@event}.subject_other", :commenter => @commenter)
+                end

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

-private
+  def changeset_comment_notification(comment, recipient)
+    with_recipient_locale recipient do
+      @to_user = recipient.display_name
+      @changeset_url = changeset_url(comment.changeset)
+      @comment = comment.body
+      @owner = recipient == comment.changeset.user
+      @commenter = comment.author.display_name
+      @changeset_comment = comment.changeset.tags["comment"].presence
+      @time = comment.created_at
+      @changeset_author = comment.changeset.user.display_name
+      @author = @commenter

 
 

-  def with_recipient_locale(recipient)
-    old_locale = I18n.locale
+      subject = if @owner
+                  I18n.t("notifier.changeset_comment_notification.commented.subject_own", :commenter => @commenter)
+                else
+                  I18n.t("notifier.changeset_comment_notification.commented.subject_other", :commenter => @commenter)
+                end
+
+      attach_user_avatar(comment.author)
+
+      mail :to => recipient.email, :subject => subject
+    end
+  end
+
+  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

 
 

-    begin
-      I18n.locale = recipient.preferred_language_from(I18n.available_locales)
+  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 && user.image
+    if image && image.file?
+      return image.path(:small)
+    else
+      return Rails.root.join("app", "assets", "images", "users", "images", "small.png")
+    end
+  end
+
+  def with_recipient_locale(recipient)
+    I18n.with_locale Locale.available.preferred(recipient.preferred_languages) do

       yield
       yield

-    ensure
-      I18n.locale = old_locale

     end
   end
 
     end
   end
 

-  def from_address(name, type, id, digest)
-    if Object.const_defined?(:MESSAGES_DOMAIN) and domain = MESSAGES_DOMAIN
-      "#{name} <#{type}-#{id}-#{digest[0,6]}@#{domain}>"
+  def from_address(name, type, id, digest, user_id = nil)
+    if Object.const_defined?(:MESSAGES_DOMAIN) && domain = MESSAGES_DOMAIN
+      if user_id
+        "#{name} <#{type}-#{id}-#{user_id}-#{digest[0, 6]}@#{domain}>"
+      else
+        "#{name} <#{type}-#{id}-#{digest[0, 6]}@#{domain}>"
+      end

     else
       EMAIL_FROM
     end
     else
       EMAIL_FROM
     end