]> git.openstreetmap.org Git - rails.git/blobdiff - app/models/notifier.rb
Exclude hidden diary entries and comments from spam scoring
[rails.git] / app / models / notifier.rb
index ee40a0d6efad9c48f1c9d242669df674485ce467..36564f61492a4a60ee08092817d75076d0111f14 100644 (file)
@@ -4,10 +4,12 @@ class Notifier < ActionMailer::Base
           :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
       @url = url_for(:host => SERVER_URL,
+                     :protocol => SERVER_PROTOCOL,
                      :controller => "user", :action => "confirm",
                      :display_name => user.display_name,
                      :confirm_string => token.token)
@@ -21,6 +23,7 @@ class Notifier < ActionMailer::Base
     with_recipient_locale user do
       @address = user.new_email
       @url = url_for(:host => SERVER_URL,
+                     :protocol => SERVER_PROTOCOL,
                      :controller => "user", :action => "confirm_email",
                      :confirm_string => token.token)
 
@@ -32,6 +35,7 @@ class Notifier < ActionMailer::Base
   def lost_password(user, token)
     with_recipient_locale user do
       @url = url_for(:host => SERVER_URL,
+                     :protocol => SERVER_PROTOCOL,
                      :controller => "user", :action => "reset_password",
                      :token => token.token)
 
@@ -72,11 +76,16 @@ class Notifier < ActionMailer::Base
       @text = message.body
       @title = message.title
       @readurl = url_for(:host => SERVER_URL,
+                         :protocol => SERVER_PROTOCOL,
                          :controller => "message", :action => "read",
                          :message_id => message.id)
       @replyurl = url_for(:host => SERVER_URL,
+                          :protocol => SERVER_PROTOCOL,
                           :controller => "message", :action => "reply",
                           :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,
@@ -91,23 +100,26 @@ class Notifier < ActionMailer::Base
       @text = comment.body
       @title = comment.diary_entry.title
       @readurl = url_for(:host => SERVER_URL,
+                         :protocol => SERVER_PROTOCOL,
                          :controller => "diary_entry",
                          :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,
+                            :protocol => SERVER_PROTOCOL,
                             :controller => "diary_entry",
                             :action => "view",
                             :display_name => comment.diary_entry.user.display_name,
                             :id => comment.diary_entry.id,
                             :anchor => "newcomment")
       @replyurl = url_for(:host => SERVER_URL,
+                          :protocol => SERVER_PROTOCOL,
                           :controller => "message",
                           :action => "new",
                           :display_name => comment.user.display_name,
                           :title => "Re: #{comment.diary_entry.title}")
-      @user_message_author = @from_user
+      @author = @from_user
 
       attach_user_avatar(comment.user)
 
@@ -121,12 +133,16 @@ class Notifier < ActionMailer::Base
     with_recipient_locale friend.befriendee do
       @friend = friend
       @viewurl = url_for(:host => SERVER_URL,
+                         :protocol => SERVER_PROTOCOL,
                          :controller => "user", :action => "view",
                          :display_name => @friend.befriender.display_name)
       @friendurl = url_for(:host => SERVER_URL,
+                           :protocol => SERVER_PROTOCOL,
                            :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,
            :subject => I18n.t("notifier.friend_notification.subject", :user => friend.befriender.display_name)
     end
@@ -146,6 +162,9 @@ class Notifier < ActionMailer::Base
                      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
@@ -158,6 +177,7 @@ class Notifier < ActionMailer::Base
 
   def changeset_comment_notification(comment, recipient)
     with_recipient_locale recipient do
+      @to_user = recipient.display_name
       @changeset_url = changeset_url(comment.changeset, :host => SERVER_URL)
       @comment = comment.body
       @owner = recipient == comment.changeset.user
@@ -165,7 +185,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
+      @author = @commenter
 
       subject = if @owner
                   I18n.t("notifier.changeset_comment_notification.commented.subject_own", :commenter => @commenter)
@@ -173,7 +193,6 @@ class Notifier < ActionMailer::Base
                   I18n.t("notifier.changeset_comment_notification.commented.subject_other", :commenter => @commenter)
                 end
 
-      attach_project_logo
       attach_user_avatar(comment.author)
 
       mail :to => recipient.email, :subject => subject
@@ -184,11 +203,10 @@ class Notifier < ActionMailer::Base
 
   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")
+    attachments.inline["logo.png"] = File.read(Rails.root.join("app", "assets", "images", "osm_logo_30.png"))
   end
 
   def attach_user_avatar(user)
@@ -196,11 +214,11 @@ class Notifier < ActionMailer::Base
   end
 
   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}/app/assets/images/users/images/small.png"
+      return Rails.root.join("app", "assets", "images", "users", "images", "small.png")
     end
   end