mirror of
https://github.com/mastodon/mastodon
synced 2024-12-30 14:38:17 +09:00
87f10d476c
Resolve #3199 Fix the aspect ratio of animated GIF whose background is transparent.
33 lines
849 B
Ruby
33 lines
849 B
Ruby
# frozen_string_literal: true
|
|
|
|
module AccountAvatar
|
|
extend ActiveSupport::Concern
|
|
|
|
IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze
|
|
|
|
class_methods do
|
|
def avatar_styles(file)
|
|
styles = { original: '120x120#' }
|
|
styles[:static] = { animated: false } if file.content_type == 'image/gif'
|
|
styles
|
|
end
|
|
|
|
private :avatar_styles
|
|
end
|
|
|
|
included do
|
|
# Avatar upload
|
|
has_attached_file :avatar, styles: ->(f) { avatar_styles(f) }, convert_options: { all: '-quality 80 -strip' }
|
|
validates_attachment_content_type :avatar, content_type: IMAGE_MIME_TYPES
|
|
validates_attachment_size :avatar, less_than: 2.megabytes
|
|
end
|
|
|
|
def avatar_original_url
|
|
avatar.url(:original)
|
|
end
|
|
|
|
def avatar_static_url
|
|
avatar_content_type == 'image/gif' ? avatar.url(:static) : avatar_original_url
|
|
end
|
|
end
|