X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e6d19586dffa03e6fac4961c0a1b64b6a237d88d..e44f856b53fcba5b44af37126579a034ef654676:/app/models/notifier.rb diff --git a/app/models/notifier.rb b/app/models/notifier.rb index b53210c30..36564f614 100644 --- a/app/models/notifier.rb +++ b/app/models/notifier.rb @@ -1,14 +1,15 @@ -require "base64" - class Notifier < ActionMailer::Base default :from => EMAIL_FROM, :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 @url = url_for(:host => SERVER_URL, + :protocol => SERVER_PROTOCOL, :controller => "user", :action => "confirm", :display_name => user.display_name, :confirm_string => token.token) @@ -22,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) @@ -33,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) @@ -73,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, @@ -92,22 +100,28 @@ 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}") + @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, @@ -119,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 @@ -144,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 @@ -156,16 +177,15 @@ class Notifier < ActionMailer::Base def changeset_comment_notification(comment, recipient) with_recipient_locale recipient do - @root_url = root_url(:host => SERVER_URL) + @to_user = recipient.display_name @changeset_url = changeset_url(comment.changeset, :host => SERVER_URL) @comment = comment.body @owner = recipient == comment.changeset.user @commenter = comment.author.display_name - @commenter_url = user_url(comment.author.display_name, :host => SERVER_URL) - @commenter_thumbnail_src = comment.author.image.url(:small, :host => SERVER_URL) @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) @@ -173,11 +193,7 @@ class Notifier < ActionMailer::Base I18n.t("notifier.changeset_comment_notification.commented.subject_other", :commenter => @commenter) end - attachments.inline['osm_logo_30x30.png'] = { - mime_type: 'image/png', - encoding: 'base64', - content: @@osm_logo_png_bytes, - } + attach_user_avatar(comment.author) mail :to => recipient.email, :subject => subject end @@ -185,6 +201,27 @@ class Notifier < ActionMailer::Base private + def set_shared_template_vars + @root_url = root_url(:host => SERVER_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) + 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 @@ -202,60 +239,4 @@ class Notifier < ActionMailer::Base EMAIL_FROM end end - - # FIXME - 2016-12-28 - saintamh - someone please show me a better way to - # include this blob in here. If I save it under app/assets, how do I get a - # path to it in a portable way? - @@osm_logo_png_bytes = <