djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-23 08:34:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix uploading higher-than-wide GIF profile picture with libvips enabled (#32911)

Browse Source
This commit is contained in:
Claire 2024-11-15 16:35:30 +01:00 committed by GitHub
parent 0838cf1e05
commit f1ef7b5b43
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/paperclip/vips_lazy_thumbnail.rb
View File

@ -52,6 +52,7 @@ module Paperclip
# implement. If cropping ever becomes necessary for other situations, this will # implement. If cropping ever becomes necessary for other situations, this will
# need to be expanded. # need to be expanded.
crop_width = crop_height = [target_width, target_height].min if @target_geometry&.square? crop_width = crop_height = [target_width, target_height].min if @target_geometry&.square?
crop_width = crop_height = "'min(iw,ih)'" if crop_width == 'ih'
filter = begin filter = begin
if @crop if @crop

BIN
spec/fixtures/files/avatar-high.gif vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 73 KiB

9
spec/support/examples/models/concerns/account_avatar.rb
View File

@ -2,13 +2,20 @@
RSpec.shared_examples 'AccountAvatar' do |fabricator| RSpec.shared_examples 'AccountAvatar' do |fabricator|
describe 'static avatars', :attachment_processing do describe 'static avatars', :attachment_processing do
describe 'when GIF' do describe 'with a square GIF' do
it 'creates a png static style' do it 'creates a png static style' do
account = Fabricate(fabricator, avatar: attachment_fixture('avatar.gif')) account = Fabricate(fabricator, avatar: attachment_fixture('avatar.gif'))
expect(account.avatar_static_url).to_not eq account.avatar_original_url expect(account.avatar_static_url).to_not eq account.avatar_original_url
end end
end end
describe 'with a higher-than-wide GIF' do
it 'creates a png static style' do
account = Fabricate(fabricator, avatar: attachment_fixture('avatar-high.gif'))
expect(account.avatar_static_url).to_not eq account.avatar_original_url
end
end
describe 'when non-GIF' do describe 'when non-GIF' do
it 'does not create extra static style' do it 'does not create extra static style' do
account = Fabricate(fabricator, avatar: attachment_fixture('attachment.jpg')) account = Fabricate(fabricator, avatar: attachment_fixture('attachment.jpg'))