Hotfix: Only run invalidations on attached images

thewca · Oct 17, 2024 · f10af12 · f10af12
1 parent 9509415
commit f10af12
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/app/models/user_avatar.rb b/app/models/user_avatar.rb
@@ -14,6 +14,8 @@ class UserAvatar < ApplicationRecord
 
   default_scope { with_attached_public_image }
 
+  delegate :attached?, to: :image
+
   enum :status, {
     pending: 'pending',
     approved: 'approved',
@@ -76,7 +78,7 @@ def thumbnail_url
 
   def using_cdn?
     # Approved avatars are actively being used and should therefor be served by our CDN
-    self.approved?
+    self.approved? && self.attached?
   end
 
   def filename
@@ -189,7 +191,7 @@ def move_image_if_approved
   end
 
   after_save :invalidate_thumbnail_if_approved,
-             if: [:active_storage?, :approved?],
+             if: [:active_storage?, :approved?, :attached?],
              unless: :destroyed?
 
   def invalidate_thumbnail_if_approved