Move make_friend and remove_friend to friendships controller

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

diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb
index 10bbb10da7ff51eb673b5621dd99bd842eaf8af2..558339889bacf758fc03d8b3edde7aa884091749 100644 (file)
--- a/app/mailers/notifier.rb
+++ b/app/mailers/notifier.rb
@@ -110,8 +110,7 @@ class Notifier < ApplicationMailer
     with_recipient_locale friend.befriendee do
       @friend = friend
       @viewurl = user_url(@friend.befriender)
-      @friendurl = url_for(:controller => "users", :action => "make_friend",
-                           :display_name => @friend.befriender.display_name)
+      @friendurl = make_friend_url(@friend.befriender)
       @author = @friend.befriender.display_name
 
       attach_user_avatar(@friend.befriender)
@@ -192,8 +191,12 @@ class Notifier < ApplicationMailer
   def user_avatar_file(user)
     avatar = user&.avatar
     if avatar&.attached?
-      image = avatar.variant(:resize => "50x50>").processed
-      image.service.download(image.key)
+      if avatar.variable?
+        image = avatar.variant(:resize => "50x50>").processed
+        image.service.download(image.key)
+      else
+        avatar.blob.download
+      end
     else
       File.read(Rails.root.join("app/assets/images/avatar_small.png"))
     end