Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream

Merge upstream changes right before the public profile redesign.

1 files changed, 3 insertions, 3 deletions

diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index c041dce51..07c08d63a 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -34,12 +34,12 @@ class MediaAttachment < ApplicationRecord
 
   IMAGE_STYLES = {
     original: {
-      geometry: '1280x1280>',
+      pixels: 1_638_400, # 1280x1280px
       file_geometry_parser: FastGeometryParser,
     },
 
     small: {
-      geometry: '400x400>',
+      pixels: 160_000, # 400x400px
       file_geometry_parser: FastGeometryParser,
     },
   }.freeze
@@ -176,7 +176,7 @@ class MediaAttachment < ApplicationRecord
       elsif AUDIO_MIME_TYPES.include? f.file_content_type
         [:audio_transcoder]
       else
-        [:thumbnail]
+        [:lazy_thumbnail]
       end
     end
   end