X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/391fb933f59075e36e9cea5ea35f5a5efdfc257e..edd49e85823079d6de19cbc9f89c6abc0568382b:/app/mailers/notifier.rb?ds=sidebyside diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb index 4b53c66f6..4509f1011 100644 --- a/app/mailers/notifier.rb +++ b/app/mailers/notifier.rb @@ -1,6 +1,8 @@ class Notifier < ActionMailer::Base - default :from => EMAIL_FROM, - :return_path => EMAIL_RETURN_PATH, + include ActionView::Helpers::AssetUrlHelper + + default :from => Settings.email_from, + :return_path => Settings.email_return_path, :auto_submitted => "auto-generated" helper :application before_action :set_shared_template_vars @@ -177,15 +179,15 @@ class Notifier < ActionMailer::Base end def attach_user_avatar(user) - attachments.inline["avatar.png"] = File.read(user_avatar_file_path(user)) + attachments.inline["avatar.png"] = user_avatar_file(user) end - def user_avatar_file_path(user) - image = user&.image - if image&.file? - return image.path(:small) + def user_avatar_file(user) + avatar = user&.avatar + if avatar&.attached? + return avatar.variant(:resize => "50x50>").blob.download else - return Rails.root.join("app", "assets", "images", "users", "images", "small.png") + return File.read(Rails.root.join("app", "assets", "images", "avatar_small.png")) end end @@ -196,14 +198,14 @@ class Notifier < ActionMailer::Base end def from_address(name, type, id, digest, user_id = nil) - if Object.const_defined?(:MESSAGES_DOMAIN) && domain = MESSAGES_DOMAIN + if Settings.key?(:messages_domain) && domain = Settings.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 + Settings.email_from end end end