nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix #6525: Make sure file is opened in LazyThumbnail processor (#6529)

This commit is contained in:
Eugen Rochko 2018-02-22 00:28:19 +01:00 committed by GitHub
parent 4bc625166e
commit d3a62d2637
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/concerns/account_avatar.rb
View File

@ -8,7 +8,7 @@ module AccountAvatar
class_methods do class_methods do
def avatar_styles(file) def avatar_styles(file)
styles = { original: { geometry: '120x120#', file_geometry_parser: FastGeometryParser } } styles = { original: { geometry: '120x120#', file_geometry_parser: FastGeometryParser } }
styles[:static] = { format: 'png', convert_options: '-coalesce', file_geometry_parser: FastGeometryParser } if file.content_type == 'image/gif' styles[:static] = { geometry: '120x120#', format: 'png', convert_options: '-coalesce', file_geometry_parser: FastGeometryParser } if file.content_type == 'image/gif'
styles styles
end end

2
app/models/concerns/account_header.rb
View File

@ -8,7 +8,7 @@ module AccountHeader
class_methods do class_methods do
def header_styles(file) def header_styles(file)
styles = { original: { geometry: '700x335#', file_geometry_parser: FastGeometryParser } } styles = { original: { geometry: '700x335#', file_geometry_parser: FastGeometryParser } }
styles[:static] = { format: 'png', convert_options: '-coalesce', file_geometry_parser: FastGeometryParser } if file.content_type == 'image/gif' styles[:static] = { geometry: '700x335#', format: 'png', convert_options: '-coalesce', file_geometry_parser: FastGeometryParser } if file.content_type == 'image/gif'
styles styles
end end

2
lib/paperclip/lazy_thumbnail.rb
View File

@ -3,7 +3,7 @@
module Paperclip module Paperclip
class LazyThumbnail < Paperclip::Thumbnail class LazyThumbnail < Paperclip::Thumbnail
def make def make
return @file unless needs_convert? return File.open(@file.path) unless needs_convert?
Paperclip::Thumbnail.make(file, options, attachment) Paperclip::Thumbnail.make(file, options, attachment)
end end