Move user images to Active Storage with paperclip as a fallback

[rails.git] / app / mailers / notifier.rb

diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb
index e705efb006756f09a6f5ff21ea8b7665689725cc..bd2c83b56e245f34f5058003f1b382fe2f2a4517 100644 (file)
--- a/app/mailers/notifier.rb
+++ b/app/mailers/notifier.rb
@@ -1,4 +1,6 @@
 class Notifier < ActionMailer::Base
 class Notifier < ActionMailer::Base

+  include ActionView::Helpers::AssetUrlHelper
+

   default :from => Settings.email_from,
           :return_path => Settings.email_return_path,
           :auto_submitted => "auto-generated"
   default :from => Settings.email_from,
           :return_path => Settings.email_return_path,
           :auto_submitted => "auto-generated"


@@ -177,7 +179,16 @@ class Notifier < ActionMailer::Base
   end
 
   def attach_user_avatar(user)
   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(user)
+    avatar = user&.avatar
+    if avatar&.attached?
+      return avatar.variant(:resize => "50x50>").blob.download
+    else
+      return File.read(user_avatar_file_path(user))
+    end

   end
 
   def user_avatar_file_path(user)
   end
 
   def user_avatar_file_path(user)


@@ -185,7 +196,7 @@ class Notifier < ActionMailer::Base
     if image&.file?
       return image.path(:small)
     else
     if image&.file?
       return image.path(:small)
     else

-      return Rails.root.join("app", "assets", "images", "users", "images", "small.png")
+      return Rails.root.join("app", "assets", "images", "avatar_small.png")

     end
   end
 
     end
   end