X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ad9f0b624728259fbe17f7b631d3efef5a488d3b..4dff06a6293971c3e17f8508859a1d80717a23f6:/app/mailers/user_mailer.rb?ds=inline diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index 24444ce1b..92c64b4d6 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -10,60 +10,64 @@ class UserMailer < ApplicationMailer before_action :set_shared_template_vars before_action :attach_project_logo - def signup_confirm(user, token) + def signup_confirm(user, token, referer = nil) with_recipient_locale user do - @url = url_for(:controller => "users", :action => "confirm", + @url = url_for(:controller => "confirmations", :action => "confirm", :display_name => user.display_name, - :confirm_string => token.token) + :confirm_string => token, + :referer => referer) mail :to => user.email, - :subject => I18n.t("user_mailer.signup_confirm.subject") + :subject => t(".subject") end end def email_confirm(user, token) with_recipient_locale user do @address = user.new_email - @url = url_for(:controller => "users", :action => "confirm_email", - :confirm_string => token.token) + @url = url_for(:controller => "confirmations", :action => "confirm_email", + :confirm_string => token) mail :to => user.new_email, - :subject => I18n.t("user_mailer.email_confirm.subject") + :subject => t(".subject") end end def lost_password(user, token) with_recipient_locale user do - @url = url_for(:controller => "users", :action => "reset_password", - :token => token.token) + @url = user_reset_password_url(:token => token) mail :to => user.email, - :subject => I18n.t("user_mailer.lost_password.subject") + :subject => t(".subject") end end def gpx_success(trace, possible_points) with_recipient_locale trace.user do + @to_user = trace.user.display_name + @trace_url = show_trace_url(trace.user, trace) @trace_name = trace.name @trace_points = trace.size @trace_description = trace.description @trace_tags = trace.tags @possible_points = possible_points + @my_traces_url = url_for(:controller => "traces", :action => "mine") mail :to => trace.user.email, - :subject => I18n.t("user_mailer.gpx_notification.success.subject") + :subject => t(".subject") end end def gpx_failure(trace, error) with_recipient_locale trace.user do + @to_user = trace.user.display_name @trace_name = trace.name @trace_description = trace.description @trace_tags = trace.tags @error = error mail :to => trace.user.email, - :subject => I18n.t("user_mailer.gpx_notification.failure.subject") + :subject => t(".subject") end end @@ -79,9 +83,9 @@ class UserMailer < ApplicationMailer attach_user_avatar(message.sender) - mail :from => from_address(message.sender.display_name, "m", message.id, message.digest), + mail :from => from_address(message.sender.display_name, "m", message.id, message.notification_token), :to => message.recipient.email, - :subject => I18n.t("user_mailer.message_notification.subject_header", :subject => message.title) + :subject => t(".subject", :message_title => message.title) end end @@ -94,15 +98,16 @@ class UserMailer < ApplicationMailer @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}" }) + @unsubscribeurl = diary_entry_unsubscribe_url(comment.diary_entry.user, comment.diary_entry) @author = @from_user attach_user_avatar(comment.user) set_references("diary", comment.diary_entry) - mail :from => from_address(comment.user.display_name, "c", comment.id, comment.digest, recipient.id), + mail :from => from_address(comment.user.display_name, "c", comment.id, comment.notification_token(recipient.id), recipient.id), :to => recipient.email, - :subject => I18n.t("user_mailer.diary_comment_notification.subject", :user => comment.user.display_name) + :subject => t(".subject", :user => comment.user.display_name) end end @@ -115,13 +120,13 @@ class UserMailer < ApplicationMailer attach_user_avatar(@friendship.befriender) mail :to => friendship.befriendee.email, - :subject => I18n.t("user_mailer.friendship_notification.subject", :user => friendship.befriender.display_name) + :subject => t(".subject", :user => friendship.befriender.display_name) end end def note_comment_notification(comment, recipient) with_recipient_locale recipient do - @noteurl = browse_note_url(comment.note) + @noteurl = 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 @@ -130,7 +135,7 @@ class UserMailer < ApplicationMailer @commenter = if comment.author comment.author.display_name else - I18n.t("user_mailer.note_comment_notification.anonymous") + t(".anonymous") end @author = @commenter @@ -139,9 +144,9 @@ class UserMailer < ApplicationMailer set_references("note", comment.note) subject = if @owner - I18n.t("user_mailer.note_comment_notification.#{@event}.subject_own", :commenter => @commenter) + t(".#{@event}.subject_own", :commenter => @commenter) else - I18n.t("user_mailer.note_comment_notification.#{@event}.subject_other", :commenter => @commenter) + t(".#{@event}.subject_other", :commenter => @commenter) end mail :to => recipient.email, :subject => subject @@ -161,9 +166,9 @@ class UserMailer < ApplicationMailer @author = @commenter subject = if @owner - I18n.t("user_mailer.changeset_comment_notification.commented.subject_own", :commenter => @commenter) + t(".commented.subject_own", :commenter => @commenter) else - I18n.t("user_mailer.changeset_comment_notification.commented.subject_other", :commenter => @commenter) + t(".commented.subject_other", :commenter => @commenter) end attach_user_avatar(comment.author) @@ -181,24 +186,41 @@ class UserMailer < ApplicationMailer end def attach_project_logo - attachments.inline["logo.png"] = File.read(Rails.root.join("app/assets/images/osm_logo_30.png")) + attachments.inline["logo.png"] = Rails.root.join("app/assets/images/osm_logo_30.png").read end def attach_user_avatar(user) - attachments.inline["avatar.png"] = user_avatar_file(user) + @avatar = user_avatar_filename(user) + attachments.inline[@avatar] = user_avatar_file(user) + end + + def user_avatar_filename(user) + avatar = user&.avatar + if avatar&.attached? + case avatar.content_type + when "image/png" then "avatar.png" + when "image/jpeg" then "avatar.jpg" + when "image/gif" then "avatar.gif" + when "image/bmp" then "avatar.bmp" + when "image/tiff" then "avatar.tif" + when "image/svg+xml" then "avatar.svg" + else "avatar" + end + else + "avatar.png" + end end def user_avatar_file(user) avatar = user&.avatar if avatar&.attached? if avatar.variable? - image = avatar.variant(:resize => "50x50>").processed - image.service.download(image.key) + avatar.variant(:resize_to_limit => [50, 50]).download else avatar.blob.download end else - File.read(Rails.root.join("app/assets/images/avatar_small.png")) + Rails.root.join("app/assets/images/avatar_small.png").read end end @@ -206,12 +228,12 @@ class UserMailer < ApplicationMailer I18n.with_locale(Locale.available.preferred(recipient.preferred_languages), &block) end - def from_address(name, type, id, digest, user_id = nil) + def from_address(name, type, id, token, user_id = nil) if Settings.key?(:messages_domain) && domain = Settings.messages_domain if user_id - "#{name} <#{type}-#{id}-#{user_id}-#{digest[0, 6]}@#{domain}>" + "#{name} <#{type}-#{id}-#{user_id}-#{token}@#{domain}>" else - "#{name} <#{type}-#{id}-#{digest[0, 6]}@#{domain}>" + "#{name} <#{type}-#{id}-#{token}@#{domain}>" end else Settings.email_from