X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/417176f8685ae60b670e609ca4d7e2e7c5c07647..c356e670ce210cafaf9a191a7323e6c67722bee6:/app/models/notifier.rb?ds=inline diff --git a/app/models/notifier.rb b/app/models/notifier.rb index ee40a0d6e..554d1e364 100644 --- a/app/models/notifier.rb +++ b/app/models/notifier.rb @@ -4,11 +4,11 @@ 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, - :controller => "user", :action => "confirm", + @url = url_for(:controller => "user", :action => "confirm", :display_name => user.display_name, :confirm_string => token.token) @@ -20,8 +20,7 @@ class Notifier < ActionMailer::Base 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, @@ -31,8 +30,7 @@ class Notifier < ActionMailer::Base 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, @@ -71,12 +69,11 @@ class Notifier < ActionMailer::Base @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, @@ -90,24 +87,11 @@ class Notifier < ActionMailer::Base @from_user = comment.user.display_name @text = comment.body @title = comment.diary_entry.title - @readurl = url_for(:host => SERVER_URL, - :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, - :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, - :controller => "message", - :action => "new", - :display_name => comment.user.display_name, - :title => "Re: #{comment.diary_entry.title}") - @user_message_author = @from_user + @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}" }) + + @author = @from_user attach_user_avatar(comment.user) @@ -120,13 +104,12 @@ class Notifier < ActionMailer::Base def friend_notification(friend) with_recipient_locale friend.befriendee do @friend = friend - @viewurl = url_for(:host => SERVER_URL, - :controller => "user", :action => "view", - :display_name => @friend.befriender.display_name) - @friendurl = url_for(:host => SERVER_URL, - :controller => "user", :action => "make_friend", + @viewurl = user_url(@friend.befriender) + @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, :subject => I18n.t("notifier.friend_notification.subject", :user => friend.befriender.display_name) end @@ -134,7 +117,7 @@ class Notifier < ActionMailer::Base 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 @@ -146,6 +129,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,14 +144,15 @@ class Notifier < ActionMailer::Base def changeset_comment_notification(comment, recipient) with_recipient_locale recipient do - @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 @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 +160,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 @@ -183,12 +169,11 @@ class Notifier < ActionMailer::Base private def set_shared_template_vars - @root_url = root_url(:host => SERVER_URL) - attach_project_logo + @root_url = root_url 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 +181,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