diff options
| author | ThibG <thib@sitedethib.com> | 2018-07-30 16:51:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-30 16:51:55 +0200 |
| commit | ce090a5201aceaab9a5c9621a6cdb3c7beefcc40 (patch) | |
| tree | 8727c7f3f289fa29051a31df67d6dc8d5c60e422 /app/models | |
| parent | b02bfe86ce26ef001420841673257c9c5326b45c (diff) | |
| parent | 5f1bdca4c8c3f34e0cc8f6ed3b6a264f42cc8ed2 (diff) | |
Merge pull request #614 from ThibG/glitch-soc/merge-upstream
Merge upstream changes up to (excluding) profile redesign
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/media_attachment.rb | 6 |
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 |