X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/689769cadad01bf6be271ecaf40a625c3edc7676..1d86379a5c55d1007f002ca0505b69d43a37def6:/app/models/notifier.rb diff --git a/app/models/notifier.rb b/app/models/notifier.rb index ea10eeb7b..40f1875be 100644 --- a/app/models/notifier.rb +++ b/app/models/notifier.rb @@ -1,5 +1,3 @@ -require "base64" - class Notifier < ActionMailer::Base default :from => EMAIL_FROM, :return_path => EMAIL_RETURN_PATH, @@ -173,15 +171,8 @@ 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, - } - - File.open(user_avatar_file_path(comment.author), 'rb') do |file| - attachments.inline['avatar.png'] = file.read() - end + attachments.inline['logo.png'] = File.read(Rails.root.join('app', 'assets', 'images', 'osm_logo_30.png')) + attachments.inline['avatar.png'] = File.read(user_avatar_file_path(comment.author)) mail :to => recipient.email, :subject => subject end @@ -215,60 +206,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 = <